diff --git a/lib/Connection.js b/lib/Connection.js
index 537f6be..9211dc9 100644
--- a/lib/Connection.js
+++ b/lib/Connection.js
@@ -1115,7 +1115,8 @@ Connection.prototype._resUntagged = function(info) {
 
     if (toget.length === 0) {
       process.nextTick(function() {
-        msg.ended = true;
+        if (msg)
+          msg.ended = true;
         msgEmitter.emit('attributes', attrs);
         msgEmitter.emit('end');
       });
diff --git a/test/test-connection-fetch-dup.js b/test/test-connection-fetch-dup.js
index ff54abb..9344d85 100644
--- a/test/test-connection-fetch-dup.js
+++ b/test/test-connection-fetch-dup.js
@@ -53,7 +53,8 @@ srv.listen(0, '127.0.0.1', function() {
     user: 'foo',
     password: 'bar',
     host: '127.0.0.1',
-    port: port
+    port: port,
+    keepalive: false
   });
   imap.on('ready', function() {
     imap.openBox('INBOX', true, function() {
diff --git a/test/test-connection-fetch-frag.js b/test/test-connection-fetch-frag.js
index 46341ea..b05a15a 100644
--- a/test/test-connection-fetch-frag.js
+++ b/test/test-connection-fetch-frag.js
@@ -53,7 +53,8 @@ srv.listen(0, '127.0.0.1', function() {
     user: 'foo',
     password: 'bar',
     host: '127.0.0.1',
-    port: port
+    port: port,
+    keepalive: false
   });
   imap.on('ready', function() {
     imap.openBox('INBOX', true, function() {