diff --git a/editor/js/ui/palette.js b/editor/js/ui/palette.js
index 99d99a214..d83e3a082 100644
--- a/editor/js/ui/palette.js
+++ b/editor/js/ui/palette.js
@@ -412,16 +412,17 @@ RED.palette = (function() {
             for (var j=0;j<nodeSet.types.length;j++) {
                 showNodeType(nodeSet.types[j]);
                 var def = RED.nodes.getType(nodeSet.types[j]);
-                if (def.onpaletteadd && typeof def.onpaletteadd === "function") {
+                if (def && def.onpaletteadd && typeof def.onpaletteadd === "function") {
                     def.onpaletteadd.call(def);
                 }
             }
         });
         RED.events.on('registry:node-set-disabled', function(nodeSet) {
+            console.log(nodeSet);
             for (var j=0;j<nodeSet.types.length;j++) {
                 hideNodeType(nodeSet.types[j]);
                 var def = RED.nodes.getType(nodeSet.types[j]);
-                if (def.onpaletteremove && typeof def.onpaletteremove === "function") {
+                if (def && def.onpaletteremove && typeof def.onpaletteremove === "function") {
                     def.onpaletteremove.call(def);
                 }
             }
@@ -431,7 +432,7 @@ RED.palette = (function() {
                 for (var j=0;j<nodeSet.types.length;j++) {
                     removeNodeType(nodeSet.types[j]);
                     var def = RED.nodes.getType(nodeSet.types[j]);
-                    if (def.onpaletteremove && typeof def.onpaletteremove === "function") {
+                    if (def && def.onpaletteremove && typeof def.onpaletteremove === "function") {
                         def.onpaletteremove.call(def);
                     }
                 }
diff --git a/red/runtime/nodes/registry/installer.js b/red/runtime/nodes/registry/installer.js
index a81d051ad..4a5347bcb 100644
--- a/red/runtime/nodes/registry/installer.js
+++ b/red/runtime/nodes/registry/installer.js
@@ -29,8 +29,7 @@ var npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 var paletteEditorEnabled = false;
 
 var settings;
-
-var moduleRe = /^[^/]+$/;
+var moduleRe = /^(@[^/]+?[/])?[^/]+?$/;
 var slashRe = process.platform === "win32" ? /\\|[/]/ : /[/]/;
 
 function init(_settings) {
diff --git a/red/runtime/nodes/registry/localfilesystem.js b/red/runtime/nodes/registry/localfilesystem.js
index 26562c50d..c2f0f9359 100644
--- a/red/runtime/nodes/registry/localfilesystem.js
+++ b/red/runtime/nodes/registry/localfilesystem.js
@@ -115,12 +115,26 @@ function getLocalNodeFiles(dir) {
 
 function scanDirForNodesModules(dir,moduleName) {
     var results = [];
+    var scopeName;
     try {
         var files = fs.readdirSync(dir);
+        if (moduleName) {
+            var m = /^(?:(@[^/]+)[/])?([^@/]+)/.exec(moduleName);
+            if (m) {
+                scopeName = m[1];
+                moduleName = m[2];
+            }
+        }
         for (var i=0;i<files.length;i++) {
             var fn = files[i];
             if (/^@/.test(fn)) {
-                results = results.concat(scanDirForNodesModules(path.join(dir,fn),moduleName));
+                if (scopeName && scopeName === fn) {
+                    // Looking for a specific scope/module
+                    results = results.concat(scanDirForNodesModules(path.join(dir,fn),moduleName));
+                    break;
+                } else {
+                    results = results.concat(scanDirForNodesModules(path.join(dir,fn),moduleName));
+                }
             } else {
                 if (isIncluded(fn) && !isExcluded(fn) && (!moduleName || fn == moduleName)) {
                     var pkgfn = path.join(dir,fn,"package.json");