diff --git a/static/js/app.js b/static/js/app.js
index 47dfc0e7d..7a6ed75d7 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -109,6 +109,14 @@ quayApp.config(['$routeProvider', '$locationProvider', 'pages', function($routeP
     {id: 'layout', templatePath: '/static/partials/'}
   ], layoutProfile);
 
+  if (window.__features.SUPER_USERS) {
+                // QE Management
+    routeBuilder.route('/superuser/', 'superuser')
+
+                // QE Setup
+                .route('/setup/', 'setup');
+  }
+
   routeBuilder
     // Repository View
     .route('/repository/:namespace/:name', 'repo-view')
@@ -162,12 +170,6 @@ quayApp.config(['$routeProvider', '$locationProvider', 'pages', function($routeP
     // New Repository
     .route('/new/', 'new-repo')
 
-    // ER Management
-    .route('/superuser/', 'superuser')
-
-    // ER Setup
-    .route('/setup/', 'setup')
-
     // Plans
     .route('/plans/', 'plans')
 
diff --git a/static/js/pages/error-view.js b/static/js/pages/error-view.js
index 9f13cb717..e81e94ac3 100644
--- a/static/js/pages/error-view.js
+++ b/static/js/pages/error-view.js
@@ -11,7 +11,7 @@
   }]);
 
   function ErrorViewCtrl($scope, ApiService, $routeParams, UserService) {
-    $scope.info = window.__error_info;
-    $scope.code = window.__error_code;
+    $scope.info = window.__error_info || {};
+    $scope.code = window.__error_code || 404;
   }
 }());
\ No newline at end of file
diff --git a/static/partials/error-view.html b/static/partials/error-view.html
index df17e4bc3..fe53d8fb2 100644
--- a/static/partials/error-view.html
+++ b/static/partials/error-view.html
@@ -11,10 +11,10 @@
         <h4 ng-if="!info.for_repo && !info.namespace_exists">
             Return to the <a href="/">main page</a>
         </h4>
-        <h4 ng-if="info && !info.namespace_exists">
+        <h4 ng-if="info && !info.namespace_exists && info.namespace">
             <a href="/organizations/new?namespace={{ info.namespace }}">Create this namespace</a> or return to the <a href="/">main page</a>
         </h4>
-        <h4 ng-if="info && info.for_repo && info.namespace_exists">
+        <h4 ng-if="info && info.for_repo && info.namespace_exists && info.namespace">
             <a href="/new?namespace={{ info.namespace }}&name={{ info.repo_name }}">Create this repository</a> or return to the <a href="/">main page</a>
         </h4>
     </div>