diff --git a/lib/server.js b/lib/server.js
index 8f84bfd1..9b1732be 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -76,14 +76,18 @@
             lHTTPS      = 'https://',
             
             lSockets    = function(pServer) {
-                var lListen, msg, status;
+                var listen, msg,
+                    status = 'off';
                 
                 if (lConfig.socket && Socket) {
-                    lListen = Socket.listen(pServer);
-                    Console.init();
+                    listen = Socket.listen(pServer);
+                    
+                    if (listen) {
+                        status = 'on';
+                        Console.init();
+                    }
                 }
                 
-                status  = lListen ? 'on' : 'off';
                 msg     = CloudFunc.formatMsg('sockets', '', status);
                 
                 Util.log(msg);
diff --git a/lib/server/socket.js b/lib/server/socket.js
index d7ddc864..8e196414 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -37,8 +37,6 @@
      * @pServer {Object} started server object
      */
     function listen(pServer) {
-        var ret;
-        
         if (io) {
             io          = io.listen(pServer);
             
@@ -65,6 +63,6 @@
             ]);
         }
         
-        return ret;
+        return io;
     }
 })();