diff --git a/lib/server.js b/lib/server.js
index dd9fe405..35dbd6ce 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -243,8 +243,17 @@
                     dir         : dir,
                     write       : stream,
                     callback    : function(error) {
-                        if (error)
-                            main.sendError(params, error);
+                        var errorStr;
+                        
+                        if (error) {
+                            if (!p.response.headersSent)
+                                main.sendError(params, error);
+                            else {
+                                Util.log(error);
+                                errorStr = error.toString();
+                                stream.end(errorStr);
+                            }
+                        }
                     }
                 });