diff --git a/server.js b/server.js
index 34b0b39e5..1d93e5401 100644
--- a/server.js
+++ b/server.js
@@ -151,7 +151,8 @@ app.get('/user/:username', async (req, res, next)=>{
 			console.error(err);
 		});
 
-		brews = _.concat(brews, googleBrews);
+		if(googleBrews)
+			brews = _.concat(brews, googleBrews);
 	}
 
 	req.brews = _.map(brews, (brew)=>{
diff --git a/server/googleActions.js b/server/googleActions.js
index c0a257db6..8faa0c720 100644
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -100,6 +100,7 @@ GoogleActions = {
 		})
 		.catch((err)=>{
 	    return console.error(`Error Listing Google Brews: ${err}`);
+			//TODO: Should break out here, but continues on for some reason.
 	  });
 
 		if(!obj.data.files.length) {