diff --git a/public/red/history.js b/public/red/history.js
index 71c74ef98..c0dd4648c 100644
--- a/public/red/history.js
+++ b/public/red/history.js
@@ -193,6 +193,7 @@ RED.history = (function() {
                 }
                 RED.view.dirty(ev.dirty);
                 RED.view.redraw();
+                RED.palette.refresh();
             }
         }
     }
diff --git a/public/red/ui/editor.js b/public/red/ui/editor.js
index 72beb0b35..e94ab1a91 100644
--- a/public/red/ui/editor.js
+++ b/public/red/ui/editor.js
@@ -28,13 +28,15 @@ RED.editor = (function() {
      * @returns {boolean} whether the node is valid. Sets node.dirty if needed
      */
     function validateNode(node) {
-        var oldValue = node.valid;
-        node.valid = validateNodeProperties(node, node._def.defaults, node);
-        if (node._def._creds) {
-            node.valid = node.valid && validateNodeProperties(node, node._def.credentials, node._def._creds);
-        }
-        if (oldValue != node.valid) {
-            node.dirty = true;
+        if (node._def) {
+            var oldValue = node.valid;
+            node.valid = validateNodeProperties(node, node._def.defaults, node);
+            if (node._def._creds) {
+                node.valid = node.valid && validateNodeProperties(node, node._def.credentials, node._def._creds);
+            }
+            if (oldValue != node.valid) {
+                node.dirty = true;
+            }
         }
     }