diff --git a/lib/server/socket.js b/lib/server/socket.js
index fc599990..a85c9974 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -247,22 +247,21 @@
         });
         
         if (cmd) {
-            send        = function(data, isError) {
-                var lExec               = {},
-                    msg                 = data.toString();
-                    
-                if (isError)
-                    lExec.stderr    = msg;
-                else
-                    lExec.stdout    = msg;
+            send        = function(error, data) {
+                var exec    = {
+                        stderr: error   + '',
+                        stdout: data    + ''
+                    };
                 
-                Util.exec(callback, lExec);
+                Util.exec(callback, exec);
             };
             
-            cmd.stdout.on('data', send);
+            cmd.stdout.on('data', function(data) {
+                send(null, data);
+            });
             
-            cmd.stderr.on('data', function(data) {
-                send(data, true);
+            cmd.stderr.on('data', function(error) {
+                send(error);
             });
             
             cmd.on('error', Util.retFalse);