diff --git a/ChangeLog b/ChangeLog
index 72ac659b..ee2e6ad7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@ started.
 
 * Removed resing event from jquery-terminal.
 
+* Fixed bug with error code of program execution in terminal.
+
 
 2012.10.01, Version 0.1.7
 
diff --git a/lib/client/socket.js b/lib/client/socket.js
index d1aab1b7..4cca6819 100644
--- a/lib/client/socket.js
+++ b/lib/client/socket.js
@@ -73,9 +73,9 @@ var CloudCommander, io;
             
             if(lStdout)
                 lResult = lTerm.echo(lStdout);
-            
-            if(lStderr)
-                lResult = lTerm.error(lStderr);
+                        
+            if(lStderr && lStderr.code != 1)
+                lResult = lTerm.error(lStderr.toString());
         }
         else{
             /* if term not accesable
diff --git a/lib/server/socket.js b/lib/server/socket.js
index f1b21c8a..586190ed 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -66,6 +66,9 @@ function onMessage(pConnNum, pSocket){
                     lMsg = JSON.stringify(lMsg);
                     pSocket.send(lMsg);
                     
+                    console.log('received from client: ' + pCommand);
+                    console.log('sended to client: ' + lMsg);
+                    
                     return;
                 }
             }