diff --git a/lib/client/socket.js b/lib/client/socket.js
index 5c816661..b1922916 100644
--- a/lib/client/socket.js
+++ b/lib/client/socket.js
@@ -3,9 +3,9 @@ var CloudCommander, io, socket;
 (function(){
     "use strict";
     
-    var cloudcmd    = CloudCommander,
-        Util        = cloudcmd.Util,
-        Term        = cloudcmd.Terminal.JqueryTerminal.Term;
+    var cloudcmd        = CloudCommander,
+        Util            = cloudcmd.Util,
+        JqueryTerminal  = cloudcmd.Terminal.JqueryTerminal;
     
     Util.jsload("/socket.io/lib/socket.io.js", {
         onload : function(){
@@ -14,17 +14,16 @@ var CloudCommander, io, socket;
             cloudcmd.Socket = socket;
             
             socket.on('connect', function () {
-                console.log('socket connected');
+                outToTerminal('socket connected');
             });
             
             socket.on('message', function (msg) {
-                console.log(msg);
-                if(Term)
-                    Term.echo(msg);
+                outToTerminal(msg);
+              
             });
             
             socket.on('disconnect', function () {
-                console.log('socket disconected');
+                outToTerminal('socket disconected');
             });
         },
         
@@ -33,4 +32,19 @@ var CloudCommander, io, socket;
                 'npm i socket.io');
         }
     });
+    
+    function outToTerminal(pMsg){
+        var lTerm   = JqueryTerminal.Term,
+            lResult = true;
+        
+        if(lTerm)
+            lResult = lTerm.echo(pMsg);
+        else
+            lResult = lTerm;
+        
+        console.log(pMsg);
+        
+        return lResult;
+    }
+    
 })();
\ No newline at end of file