diff --git a/static/js/app.js b/static/js/app.js
index b87f5fc72..4f0e0c836 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -253,13 +253,6 @@ quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', 'PlanServi
 
   // Handle session expiration.
   Restangular.setErrorInterceptor(function(response) {
-    //TODO: remove check for error_type (old style errors)
-    var invalid_token = response.data['title'] == 'invalid_token' || response.data['error_type'] == 'invalid_token';
-    if (response.status == 401 && invalid_token && response.data['session_required'] !== false) {
-      $('#sessionexpiredModal').modal({});
-      return false;
-    }
-
     if (response.status == 503) {
       $('#cannotContactService').modal({});
       return false;
@@ -270,6 +263,16 @@ quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', 'PlanServi
       return false;
     }
 
+    if (!response.data) {
+      return true;
+    }
+
+    var invalid_token = response.data['title'] == 'invalid_token' || response.data['error_type'] == 'invalid_token';
+    if (response.status == 401 && invalid_token && response.data['session_required'] !== false) {
+      $('#sessionexpiredModal').modal({});
+      return false;
+    }
+
     return true;
   });