diff --git a/.gitignore b/.gitignore
index 75876a6..99d408d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ public/out
 public/dist
 public/components
 .idea/
+.settings/
diff --git a/app/controllers/home.js b/app/controllers/home.js
index d3e60d6..5021047 100644
--- a/app/controllers/home.js
+++ b/app/controllers/home.js
@@ -26,6 +26,9 @@ router.get('/', function (req, res, next) {
     untappd.setClientSecret(process.env.untappdsecret);
 
     untappd.userFeed(function(err,obj){
+      if((err != undefined && err != null) || obj.response.checkins.items.length < 1){
+        return res.render('index', {});
+      }
       var validCheckin = null;
      obj.response.checkins.items.forEach(function(checkin){
           console.log(checkin);