diff --git a/editor/js/ui/deploy.js b/editor/js/ui/deploy.js
index babf80d28..6bb771778 100644
--- a/editor/js/ui/deploy.js
+++ b/editor/js/ui/deploy.js
@@ -124,6 +124,36 @@ RED.deploy = (function() {
         });
     }
 
+    function getNodeInfo(node) {
+        var tabLabel = "";
+        if (node.z) {
+            var tab = RED.nodes.workspace(node.z);
+            if (!tab) {
+                tab = RED.nodes.subflow(node.z);
+                tabLabel = tab.name;
+            } else {
+                tabLabel = tab.label;
+            }
+        }
+        var label = "";
+        if (typeof node._def.label == "function") {
+            label = node._def.label.call(node);
+        } else {
+            label = node._def.label;
+        }
+        label = label || node.id;
+        return {tab:tabLabel,type:node.type,label:label};
+    }
+    function sortNodeInfo(A,B) {
+        if (A.tab < B.tab) { return -1;}
+        if (A.tab > B.tab) { return 1;}
+        if (A.type < B.type) { return -1;}
+        if (A.type > B.type) { return 1;}
+        if (A.name < B.name) { return -1;}
+        if (A.name > B.name) { return 1;}
+        return 0;
+    }
+
     function save(force) {
         if (RED.nodes.dirty()) {
             //$("#debug-tab-clear").click();  // uncomment this to auto clear debug on deploy
@@ -134,8 +164,13 @@ RED.deploy = (function() {
                 var hasUnusedConfig = false;
 
                 var unknownNodes = [];
+                var invalidNodes = [];
+
                 RED.nodes.eachNode(function(node) {
                     hasInvalid = hasInvalid || !node.valid;
+                    if (!node.valid) {
+                        invalidNodes.push(getNodeInfo(node));
+                    }
                     if (node.type === "unknown") {
                         if (unknownNodes.indexOf(node.name) == -1) {
                             unknownNodes.push(node.name);
@@ -144,18 +179,10 @@ RED.deploy = (function() {
                 });
                 hasUnknown = unknownNodes.length > 0;
 
-                var unusedConfigNodes = {};
+                var unusedConfigNodes = [];
                 RED.nodes.eachConfig(function(node) {
                     if (node.users.length === 0) {
-                        var label = "";
-                        if (typeof node._def.label == "function") {
-                            label = node._def.label.call(node);
-                        } else {
-                            label = node._def.label;
-                        }
-                        label = label || node.id;
-                        unusedConfigNodes[node.type] = unusedConfigNodes[node.type]  || [];
-                        unusedConfigNodes[node.type].push(label);
+                        unusedConfigNodes.push(getNodeInfo(node));
                         hasUnusedConfig = true;
                     }
                 });
@@ -176,19 +203,18 @@ RED.deploy = (function() {
                     showWarning = true;
                     $( "#node-dialog-confirm-deploy-type" ).val("invalid");
                     $( "#node-dialog-confirm-deploy-config" ).show();
+                    invalidNodes.sort(sortNodeInfo);
+                    $( "#node-dialog-confirm-deploy-invalid-list" )
+                        .html("<li>"+invalidNodes.map(function(A) { return (A.tab?"["+A.tab+"] ":"")+A.label+" ("+A.type+")"}).join("</li><li>")+"</li>");
+
                 } else if (hasUnusedConfig && !ignoreDeployWarnings.unusedConfig) {
                     showWarning = true;
                     $( "#node-dialog-confirm-deploy-type" ).val("unusedConfig");
                     $( "#node-dialog-confirm-deploy-unused" ).show();
-                    var unusedNodeLabels = [];
-                    var unusedTypes = Object.keys(unusedConfigNodes).sort();
-                    unusedTypes.forEach(function(type) {
-                        unusedConfigNodes[type].forEach(function(label) {
-                                unusedNodeLabels.push(type+": "+label);
-                        });
-                    });
+
+                    unusedConfigNodes.sort(sortNodeInfo);
                     $( "#node-dialog-confirm-deploy-unused-list" )
-                        .html("<li>"+unusedNodeLabels.join("</li><li>")+"</li>");
+                        .html("<li>"+unusedConfigNodes.map(function(A) { return (A.tab?"["+A.tab+"] ":"")+A.label+" ("+A.type+")"}).join("</li><li>")+"</li>");
                 }
                 if (showWarning) {
                     $( "#node-dialog-confirm-deploy-hide" ).prop("checked",false);
diff --git a/editor/templates/index.mst b/editor/templates/index.mst
index 10968d3f2..20ee1f902 100644
--- a/editor/templates/index.mst
+++ b/editor/templates/index.mst
@@ -101,12 +101,14 @@
 
 <div id="node-dialog-confirm-deploy" class="hide">
     <form class="form-horizontal">
-        <div id="node-dialog-confirm-deploy-config" style="text-align: left; padding-top: 30px;" data-i18n="[prepend]deploy.confirm.improperlyConfigured;[append]deploy.confirm.confirm"> </div>
+        <div id="node-dialog-confirm-deploy-config" style="text-align: left; padding-top: 30px;" data-i18n="[prepend]deploy.confirm.improperlyConfigured;[append]deploy.confirm.confirm">
+            <ul style="font-size: 0.9em; width: 400px; margin: 10px auto; text-align: left;" id="node-dialog-confirm-deploy-invalid-list"></ul>
+        </div>
         <div id="node-dialog-confirm-deploy-unknown" style="text-align: left; padding-top: 10px;" data-i18n="[prepend]deploy.confirm.unknown;[append]deploy.confirm.confirm">
-         <ul style="font-size: 0.9em; width: 400px; margin: 10px auto; text-align: left;" id="node-dialog-confirm-deploy-unknown-list"></ul>
+            <ul style="font-size: 0.9em; width: 400px; margin: 10px auto; text-align: left;" id="node-dialog-confirm-deploy-unknown-list"></ul>
         </div>
         <div id="node-dialog-confirm-deploy-unused" style="text-align: left; padding-top: 10px;" data-i18n="[prepend]deploy.confirm.unusedConfig;[append]deploy.confirm.confirm">
-         <ul style="font-size: 0.9em; width: 400px; margin: 10px auto; text-align: left;" id="node-dialog-confirm-deploy-unused-list"></ul>
+            <ul style="font-size: 0.9em; width: 400px; margin: 10px auto; text-align: left;" id="node-dialog-confirm-deploy-unused-list"></ul>
         </div>
     </form>
 </div>
diff --git a/locales/en-US/editor.json b/locales/en-US/editor.json
index 893dded3b..537952505 100644
--- a/locales/en-US/editor.json
+++ b/locales/en-US/editor.json
@@ -92,7 +92,7 @@
                 "cancel": "Cancel"
             },
             "undeployedChanges": "You have undeployed changes.\n\nLeaving this page will lose these changes.",
-            "improperlyConfigured": "Some of the nodes are not properly configured.",
+            "improperlyConfigured": "The workspace contains some nodes that are not properly configured:",
             "unknown": "The workspace contains some unknown node types:",
             "unusedConfig": "The workspace contains some unused configuration nodes:",
             "confirm": "Are you sure you want to deploy?"