diff --git a/Client/githubServer.js b/Client/githubServer.js
index ab6c1db49..74c42a104 100644
--- a/Client/githubServer.js
+++ b/Client/githubServer.js
@@ -107,8 +107,8 @@ exports.newGithubServer = function newGithubServer() {
                                 lastPage = true
                             }
 
-                            for (let i = 0; i < filesChanged.length; i++) {
-                                let listItem = filesChanged[i]
+                            for (let i = 0; i < listResponse.data.length; i++) {
+                                let listItem = listResponse.data[i]
                                 let githubUsername
                                 switch (endpoint) {
                                     case 'activity': {
@@ -237,7 +237,7 @@ exports.newGithubServer = function newGithubServer() {
                                     page: page
                                 });
 
-                                if (filesChanged.length < 100) {
+                                if (listResponse.data.length < 100) {
                                     lastPage = true
                                 }
                                 console.log('[INFO] Github Server -> mergeGithubPullRequests -> doGithub -> getPrList -> Receiving Page = ' + page)
diff --git a/Projects/Foundations/CL/Utilities/Plugins.js b/Projects/Foundations/CL/Utilities/Plugins.js
index 4f87397ea..60b18b8eb 100644
--- a/Projects/Foundations/CL/Utilities/Plugins.js
+++ b/Projects/Foundations/CL/Utilities/Plugins.js
@@ -13,7 +13,10 @@ exports.newFoundationsUtilitiesPlugins = function () {
             let path = global.env.PATH_TO_PROJECTS + '/' + project + '/Plugins/' + folder
 
             CL.nodeModules.fs.readdir(path, (err, files) => {
-                if (err) { reject() }
+                if (err) {
+                    reject()
+                    return
+                }
                 if (files === undefined) {
                     files = []
                 }
@@ -33,7 +36,10 @@ exports.newFoundationsUtilitiesPlugins = function () {
             CL.nodeModules.fs.readFile(path, onFileRead)
 
             function onFileRead(err, file) {
-                if (err) { reject() }
+                if (err) {
+                    reject()
+                    return
+                }
                 resolve(file.toString())
             }
         }