diff --git a/hyphe_frontend/app/js/service_hyphe_api.js b/hyphe_frontend/app/js/service_hyphe_api.js
index b68bd91e..725eef63 100644
--- a/hyphe_frontend/app/js/service_hyphe_api.js
+++ b/hyphe_frontend/app/js/service_hyphe_api.js
@@ -537,7 +537,7 @@ angular.module('hyphe.service_hyphe_api', [])
       )
 
     ns.list_tlds = undefined
-    ns.downloadCorpusTLDs = function(callback){
+    ns.downloadCorpusTLDs = function(callback, errback){
       if (ns.list_tlds) {
         callback(ns.list_tlds)
         return ns.list_tlds
@@ -559,6 +559,7 @@ angular.module('hyphe.service_hyphe_api', [])
           // called asynchronously if an error occurs
           // or server returns response with an error status.
           console.error('Impossible to retrieve TLDs', response)
+          if (errback) errback(response)
         })
     }
     ns.getCorpusTLDs = function(){
diff --git a/hyphe_frontend/app/views/settings.js b/hyphe_frontend/app/views/settings.js
index 40c0c4ef..68be1d9d 100644
--- a/hyphe_frontend/app/views/settings.js
+++ b/hyphe_frontend/app/views/settings.js
@@ -197,6 +197,9 @@ angular.module('hyphe.settingsController', [])
       api.globalStatus({},
         function(corpus_status){
           $scope.corpus_status = corpus_status
+          if (!$scope.corpus_status.corpus.traph) {
+            $location.path('/login')
+          }
           $scope.corpusNotEmpty = !!$scope.corpus_status.corpus.traph.webentities.total
           $scope.options = corpus_status.corpus.options
           $scope.maxmax_depth = corpus_status.hyphe.max_depth
@@ -243,6 +246,8 @@ angular.module('hyphe.settingsController', [])
           $scope.status = {message: "Error while getting options", background:'danger'}
 
         })
+    }, function(){
+      $location.path('/login')
     })
 
   }])