Merge remote-tracking branch 'github/master' into portable

debomatic-webui/lib/stats.coffee

@@ -37,7 +37,8 @@ get_disk_usage = (cb) ->
             if stderr?
                 error = '\n\t' + stderr.replace(/\n/g, '\n\t')
             utils.errors_handler "disk usage error:", error
-            return
+            if not stdout?
+                return
         result = {}
         others = 0
         for line in stdout.split('\n')

debomatic-webui/lib/utils.coffee

@@ -114,7 +114,7 @@ errors_handler = (from, err, socket) ->
     else
         msg = err
     console.error from, msg
-    socket.emit config.events.error, message if socket
+    socket.emit config.events.error, msg if socket
     return
 
 Tail::watchEvent = (e) ->