diff --git a/src/scripts/controllers/task-detail.js b/src/scripts/controllers/task-detail.js
index 6f1a0bf..a2697e9 100644
--- a/src/scripts/controllers/task-detail.js
+++ b/src/scripts/controllers/task-detail.js
@@ -60,9 +60,7 @@
             }
 
             var processError = function (message) {
-                if (message === aria2RpcErrors.Unauthorized.message) {
-                    $interval.cancel(downloadTaskRefreshPromise);
-                }
+                $interval.cancel(downloadTaskRefreshPromise);
             };
 
             var includeLocalPeer = true;
diff --git a/src/views/task-detail.html b/src/views/task-detail.html
index 8d43c3d..931189f 100644
--- a/src/views/task-detail.html
+++ b/src/views/task-detail.html
@@ -1,4 +1,4 @@
-<section class="content no-padding">
+<section class="content no-padding" ng-if="task">
     <div class="nav-tabs-custom">
         <ul class="nav nav-tabs">
             <li ng-class="{'active': context.currentTab == 'overview'}">
@@ -23,7 +23,7 @@
         <div class="tab-content no-padding">
             <div class="tab-pane" ng-class="{'active': context.currentTab == 'overview'}">
                 <div class="settings-table striped hoverable">
-                    <div class="row">
+                    <div class="row" ng-if="task">
                         <div class="setting-key col-sm-4">
                             <span translate>Task Name</span>
                         </div>