diff --git a/nodes/core/20-inject.html b/nodes/core/20-inject.html
index 254a6f39b..d716d214d 100644
--- a/nodes/core/20-inject.html
+++ b/nodes/core/20-inject.html
@@ -73,18 +73,17 @@
                         if (err) {
                             if (err.status == 404) {
                                 RED.notify("<strong>Error</strong>: inject node not deployed","error");
-                            } else {
+                            } else if (err.status == 500) {
+                                RED.notify("<strong>Error</strong>: inject failed, see log for details.","error");
+                            } else if (err.status == 0) {
                                 RED.notify("<strong>Error</strong>: no response from server","error");
+                            } else {
+                                RED.notify("<strong>Error</strong>: unexpected error: ("+err.status+")"+err.response,"error");
                             }
                         } else if (resp.status == 200) {
                             RED.notify("Successfully injected: "+label,"success");
                         } else {
-                            if (resp) {
-                                RED.notify("<strong>Error</strong>: unexpected response: RC "+resp.status+"<br/>See console log for details."error");
-                            } else {
-                                RED.notify("<strong>Error</strong>: no response from server","error");
-                            }
-                            console.log(err,resp);
+                            RED.notify("<strong>Error</strong>: unexpected response: ("+resp.status+") "+resp.response,"error");
                         }
                 });
             }
diff --git a/nodes/core/20-inject.js b/nodes/core/20-inject.js
index 972d68e27..cad4818c4 100644
--- a/nodes/core/20-inject.js
+++ b/nodes/core/20-inject.js
@@ -57,8 +57,14 @@ InjectNode.prototype.close = function() {
 RED.app.post("/inject/:id", function(req,res) {
         var node = RED.nodes.getNode(req.params.id);
         if (node != null) {
-            node.receive();
-            res.send(200);
+            try {
+                node.receive();
+                res.send(200);
+            } catch(err) {
+                res.send(500);
+                node.error("Inject failed:"+err);
+                console.log(err.stack);
+            }
         } else {
             res.send(404);
         }
diff --git a/nodes/core/58-debug.html b/nodes/core/58-debug.html
index 34de8d223..47bc91b80 100644
--- a/nodes/core/58-debug.html
+++ b/nodes/core/58-debug.html
@@ -66,8 +66,10 @@
                         if (err) {
                             if (err.status == 404) {
                                 RED.notify("<strong>Error</strong>: debug node not deployed","error");
-                            } else {
+                            } else if (err.status == 0) {
                                 RED.notify("<strong>Error</strong>: no response from server","error");
+                            } else {
+                                RED.notify("<strong>Error</strong>: unexpected error: ("+err.status+")"+err.response,"error");
                             }
                         } else if (resp.status == 200) {
                             RED.notify("Successfully activated: "+label,"success");
@@ -80,12 +82,7 @@
                             node.dirty = true;
                             RED.view.redraw();
                         } else {
-                            if (resp) {
-                                RED.notify("<strong>Error</strong>: unexpected response: "+resp,"error");
-                            } else {
-                                RED.notify("<strong>Error</strong>: no response from server","error");
-                            }
-                            console.log(err,resp);
+                            RED.notify("<strong>Error</strong>: unexpected response: ("+resp.status+") "+resp.response,"error");
                         }
                 });
             }