diff --git a/packages/node_modules/@node-red/registry/lib/loader.js b/packages/node_modules/@node-red/registry/lib/loader.js
index 9dca49d5d..6e2e4d8d8 100644
--- a/packages/node_modules/@node-red/registry/lib/loader.js
+++ b/packages/node_modules/@node-red/registry/lib/loader.js
@@ -223,8 +223,8 @@ async function loadNodeTemplate(node) {
         // ENOENT means no html file. We can live with that. But any other error
         // should be fatal
         // node.err = "Error: "+node.template+" does not exist";
+        node.types = node.types || [];
         if (err.code !== 'ENOENT') {
-            node.types = [];
             node.err = err.toString();
         }
         return node;
@@ -263,7 +263,7 @@ async function loadNodeConfig(fileInfo) {
         if (info.hasOwnProperty("loaded")) {
             throw new Error(file+" already loaded");
         }
-        isEnabled = info.enabled;
+        isEnabled = !(info.enabled === false);
     }
 
     var node = {
@@ -353,6 +353,7 @@ async function loadPluginConfig(fileInfo) {
  */
 function loadNodeSet(node) {
     if (!node.enabled) {
+        console.log("BAIL ON",node.id)
         return Promise.resolve(node);
     } else {
     }