diff --git a/lib/client.js b/lib/client.js
index 490e1d18..73f910a2 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -170,9 +170,17 @@ Client.prototype.connect = function(callback) {
       return self.emit('error', error);
     }
     callback(error);
+    callback = null;
   });
 
   con.once('end', function() {
+    if ( callback ) {
+      // haven't received a connection message yet !
+      var err = new Error("Stream unexpectedly ended before getting ready for query execution");
+      callback(err);
+      callback = null;
+      return;
+    }
     if(self.activeQuery) {
       var disconnectError = new Error('Stream unexpectedly ended during query execution');
       self.activeQuery.handleError(disconnectError);