diff --git a/lib/client.js b/lib/client.js
index d3a2064..fb41c85 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -55,8 +55,10 @@ Client.prototype.setSocket = function(socket) {
     endSocket();
   }
 
+  var ended = false;
   function endSocket() {
-    self.socket.removeListener('error', onError);
+    if (ended) return;
+    ended = true;
     self.socket.removeListener('close', endSocket);
     self.socket.removeListener('end', endSocket);
     self.socket.removeListener('timeout', endSocket);