diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
index 928ab5202..01560e152 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
@@ -666,6 +666,10 @@ RED.projects = (function() {
                                                     // This is handled via a runtime notification.
                                                     dialog.dialog("close");
                                                 },
+                                                'missing_package_file': function(error) {
+                                                    // This is handled via a runtime notification.
+                                                    dialog.dialog("close");
+                                                },
                                                 'project_empty': function(error) {
                                                     // This is handled via a runtime notification.
                                                     dialog.dialog("close");
@@ -1565,6 +1569,10 @@ RED.projects = (function() {
                                                     // This is handled via a runtime notification.
                                                     dialog.dialog("close");
                                                 },
+                                                'missing_package_file': function(error) {
+                                                    // This is handled via a runtime notification.
+                                                    dialog.dialog("close");
+                                                },
                                                 'project_empty': function(error) {
                                                     // This is handled via a runtime notification.
                                                     dialog.dialog("close");
diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/Project.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/Project.js
index d07a544c8..43772a72c 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/Project.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/Project.js
@@ -459,7 +459,7 @@ Project.prototype.status = function(user, includeRemote) {
             gitTools.getStatus(self.path),
             fs.exists(fspath.join(self.path,".git","MERGE_HEAD"))
         ];
-        return when.all(promises).then(function(results) {
+        return Promise.all(promises).then(function(results) {
             var result = results[0];
             if (results[1]) {
                 result.merging = true;
diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
index ae93f149a..01f307ce9 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
@@ -32,9 +32,9 @@ function runGitCommand(args,cwd,env,emit) {
     return exec.run(gitCommand, args, {cwd:cwd, env:env}, emit).then(result => {
         return result.stdout;
     }).catch(result => {
-        var err = new Error(stderr);
         var stdout = result.stdout;
         var stderr = result.stderr;
+        var err = new Error(stderr);
         err.stdout = stdout;
         err.stderr = stderr;
         if (/Connection refused/i.test(stderr)) {