diff --git a/lib/server/socket.js b/lib/server/socket.js
index a01346f5..5f21ee52 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -20,24 +20,30 @@
      * @pServer {Object} started server object
      */
     exports.listen = function(pServer){
-        io = io.listen(pServer);
+        var lRet;
+        if(io){
+            io = io.listen(pServer);
+            
+            /* number of connections */
+            var lConnNum = 0;
+            
+            lRet = io.sockets.on('connection', function (socket){
+                ++lConnNum;
+                socket.send('{"stdout":"client connected"}');
+                
+                console.log('server connected');
+                
+                if(!OnMessageFuncs[lConnNum])
+                    OnMessageFuncs[lConnNum] = onMessage(lConnNum, socket);
+                
+                var lConn_func = OnMessageFuncs[lConnNum];
+                
+                socket.on('message', lConn_func);
+                
+            });
+        }
         
-        /* number of connections */
-        var lConnNum = 0;
-        io.sockets.on('connection', function (socket){
-            ++lConnNum;
-            socket.send('{"stdout":"client connected"}');
-            
-            console.log('server connected');
-            
-            if(!OnMessageFuncs[lConnNum])
-                OnMessageFuncs[lConnNum] = onMessage(lConnNum, socket);
-            
-            var lConn_func = OnMessageFuncs[lConnNum];
-            
-            socket.on('message', lConn_func);
-            
-        });
+        return lRet;
     };
     
     /**