Merge branch 'master' into SAN-726-home-redirection

Author: Nathan219

client/controllers/controllerApp.js

@@ -86,7 +86,7 @@ function ControllerApp(
   };
 
   fetchUser(function(err, results) {
-    if (!err) {
+    if (!err && results) {
       thisUser = results;
       dataApp.data.user = results;
       fetchOrgs(function (err, results) {

client/services/serviceFetchInstances.js

@@ -12,6 +12,7 @@ function fetchInstances(
     } else {
       currentAccountName = activeAccountName;
       fetchUser(function (err, user) {
+        if (!user) { return cb(err); }
         currentInstances = user.fetchInstances({
           githubUsername: currentAccountName
         }, function (err) {