diff --git a/lib/socket.io/listener.js b/lib/socket.io/listener.js
index 186156d22b..0e0d52b88c 100644
--- a/lib/socket.io/listener.js
+++ b/lib/socket.io/listener.js
@@ -34,7 +34,7 @@ Listener = module.exports = function(server, options){
 			}
 		},
 		log: function(message){
-			require('sys').log(message);
+			sys.log(message);
 		}
 	}, options);
 
diff --git a/lib/socket.io/transports/flashsocket.js b/lib/socket.io/transports/flashsocket.js
index bfcf77d39f..fc94ef0112 100644
--- a/lib/socket.io/transports/flashsocket.js
+++ b/lib/socket.io/transports/flashsocket.js
@@ -35,7 +35,8 @@ try {
 
 		socket.write('</cross-domain-policy>\n');
 		socket.end();	
-	}).listen(843);
+	});
+	netserver.listen(843);
 } catch(e){
 	if (e.errno == 13){
 		console.error("\x1B[1;31m" + [
diff --git a/lib/socket.io/transports/websocket.js b/lib/socket.io/transports/websocket.js
index cd52142841..a73ae73bbb 100644
--- a/lib/socket.io/transports/websocket.js
+++ b/lib/socket.io/transports/websocket.js
@@ -78,6 +78,10 @@ WebSocket.prototype._onConnect = function(req, socket){
 		self._handle(data);
 	});
 
+	this.connection.addListener('error', function(data){
+		self._onDisconnect(data);
+	});
+
 	if (this._proveReception(headers)) this._payload();
 };