diff --git a/Makefile b/Makefile
index de2da0faf4..13987a456c 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,8 @@ test-uv: all
 		simple/test-net-reconnect \
 		simple/test-net-remote-address-port \
 		simple/test-net-server-try-ports \
-		simple/test-net-server-stream \
+		simple/test-net-stream \
+		simple/test-net-socket-timeout \
 		simple/test-next-tick \
 		simple/test-next-tick-errors \
 		simple/test-next-tick-ordering \
diff --git a/lib/net_uv.js b/lib/net_uv.js
index ac521fbc53..de672b63f2 100644
--- a/lib/net_uv.js
+++ b/lib/net_uv.js
@@ -440,7 +440,7 @@ function Server(/* [ options, ] listener */) {
     options = {};
     self.on('connection', arguments[0]);
   } else {
-    options = arguments[0];
+    options = arguments[0] || {};
     
     if (typeof arguments[1] == 'function') {
       self.on('connection', arguments[1]);