diff --git a/ChangeLog b/ChangeLog
index 9020307f..cacf84ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,6 +66,8 @@ disabled in browsers.
 
 * Added ability to freeze terminal screen on connection lost
 
+* Added serialisation to socket connection.
+
 
 2012.08.24, Version 0.1.6
  
diff --git a/lib/client/socket.js b/lib/client/socket.js
index 19d1dd88..a90734ce 100644
--- a/lib/client/socket.js
+++ b/lib/client/socket.js
@@ -70,7 +70,7 @@ var CloudCommander, io;
                 lResult = lTerm.echo(lStdout);
             
             if(lStderr)
-                lResult = lTerm.error(pMsg.lStderr);
+                lResult = lTerm.error(lStderr);
         }
         else{
             /* if term not accesable
diff --git a/lib/server/socket.js b/lib/server/socket.js
index efa240d1..49c1125f 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -14,7 +14,8 @@ exports.listen = function(pServer){
     
     io.sockets.on('connection', function (socket) {
         Socket = socket;
-        socket.send('{stdout:"client connected"}');
+
+        socket.send('{"stdout":"client connected"}');
         
         console.log('server connected');
         
@@ -42,15 +43,14 @@ function getExec(pError, pStdout, pStderr) {
     if (pError !== null) {
         console.log('exec error: ' + pError);
     }
-    else{
-        var lExec = {
-            stdout : pStdout,
-            stderr : pStderr
-        };        
-        
-        var lExec_str = JSON.stringify(lExec);
-        
-        Socket.send(lExec_str);
-        console.log(lExec);
-    }
+
+    var lExec = {
+        stdout : pStdout,
+        stderr : pStderr || pError
+    };        
+    
+    var lExec_str = JSON.stringify(lExec);
+    
+    Socket.send(lExec_str);
+    console.log(lExec);
 }