diff --git a/lib/imap.js b/lib/imap.js
index 14eb96c..6acee4e 100644
--- a/lib/imap.js
+++ b/lib/imap.js
@@ -23,7 +23,7 @@ var CRLF = '\r\n',
       BOXSELECTED: 4
     },
     RE_LITHEADER = /(?:((?:BODY\[.*\](?:<\d+>)?)?|[^ ]+) )?\{(\d+)\}$/i,
-    RE_UNRESP = /^\* (OK|PREAUTH|NO|BAD) (?:\[(.+)\] )?(.+)$/i,
+    RE_UNRESP = /^\* (OK|PREAUTH|NO|BAD)(?:\r\n| (?:\[(.+)\] )?(.+))$/i,
     //RE_ISPARTIAL = /<(\d+)>$/,
     RE_DBLQ = /"/g,
     RE_CMD = /^([^ ]+)(?: |$)/,
@@ -532,6 +532,8 @@ ImapConnection.prototype.connect = function(loginCb) {
         switch (m[1]) {
           case 'OK':
             var code = m[2];
+            if (code === undefined)
+              break;
             if (state.status === STATES.NOAUTH) {
               if (!state.isReady) {
                 clearTimeout(state.tmrConn);