diff --git a/nodes/core/core/58-debug.html b/nodes/core/core/58-debug.html
index 0adf3c91e..be7b920b0 100644
--- a/nodes/core/core/58-debug.html
+++ b/nodes/core/core/58-debug.html
@@ -187,14 +187,16 @@
                 var name = (o.name?o.name:o.id).toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
                 var topic = (o.topic||"").toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
                 var property = (o.property?o.property:'').replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
-                var payload = (o.msg||"").toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
+                var payload = (o.msg||"()").toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
+                var typ = payload.substring(0,payload.indexOf(')')+1);
+                payload = payload.substring(payload.indexOf(')')+1);
                 msg.className = 'debug-message'+(o.level?(' debug-message-level-'+o.level):'');
                 msg.innerHTML = '<span class="debug-message-date">'+
                                 getTimestamp()+'</span>'+
                                 '<span class="debug-message-name">['+name+']</span>'+
                                 '<span class="debug-message-topic">'+
                                 (o.topic?topic+' : ':'')+
-                                (o.property?'[msg.'+property+']':'[msg]')+
+                                (o.property?'[msg.'+property+']':'[msg]')+" : "+typ+
                                 '</span>'+'<span class="debug-message-payload">'+
                                 payload+'</span>';
                 var atBottom = (sbc.scrollHeight-messages.offsetHeight-sbc.scrollTop) < 5;
diff --git a/nodes/core/core/58-debug.js b/nodes/core/core/58-debug.js
index 33bbea39b..c30356cc3 100644
--- a/nodes/core/core/58-debug.js
+++ b/nodes/core/core/58-debug.js
@@ -99,11 +99,13 @@ module.exports = function(RED) {
             seen = null;
         } else if (typeof msg.msg === "boolean") {
             msg.msg = "(boolean) "+msg.msg.toString();
+        } else if (typeof msg.msg === "number") {
+            msg.msg = "(number) "+msg.msg.toString();
         } else if (msg.msg === 0) {
             msg.msg = "0";
         } else if (msg.msg === null || typeof msg.msg === "undefined") {
             msg.msg = "(undefined)";
-        }
+        } else { msg.msg = "(string) "+msg.msg; }
 
         if (msg.msg.length > debuglength) {
             msg.msg = msg.msg.substr(0,debuglength) +" ....";