diff --git a/editor/js/history.js b/editor/js/history.js
index ac155bd88..12650c9a2 100644
--- a/editor/js/history.js
+++ b/editor/js/history.js
@@ -191,7 +191,7 @@ RED.history = (function() {
             } else if (ev.t == "edit") {
                 for (i in ev.changes) {
                     if (ev.changes.hasOwnProperty(i)) {
-                        if (ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
+                        if (ev.node._def.defaults && ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
                             // This is a config node property
                             var currentConfigNode = RED.nodes.node(ev.node[i]);
                             if (currentConfigNode) {
diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
index c14b81fef..c3f0d4ea5 100644
--- a/editor/js/ui/editor.js
+++ b/editor/js/ui/editor.js
@@ -742,7 +742,7 @@ RED.editor = (function() {
             buildLabelRow().appendTo(outputsDiv);
         }
 
-        if (!node._def.defaults.hasOwnProperty("icon") && node.type !== "subflow") {
+        if ((!node._def.defaults || !node._def.defaults.hasOwnProperty("icon")) && node.type !== "subflow") {
             $('<div class="form-row"><div id="node-settings-icon"></div></div>').appendTo(dialogForm);
             var iconDiv = $("#node-settings-icon");
             $('<label data-i18n="editor.settingIcon">').appendTo(iconDiv);
@@ -1071,7 +1071,7 @@ RED.editor = (function() {
                             changed = true;
                         }
 
-                        if (!editing_node._def.defaults.hasOwnProperty("icon")) {
+                        if (!editing_node._def.defaults || !editing_node._def.defaults.hasOwnProperty("icon")) {
                             var iconModule = $("#node-settings-icon-module-hidden").val();
                             var iconFile = $("#node-settings-icon-file-hidden").val();
                             var icon = (iconModule && iconFile) ? iconModule+"/"+iconFile : "";