diff --git a/public/app/core/controllers/error_ctrl.js b/public/app/core/controllers/error_ctrl.js
index cc711f07a22..fd4081186be 100644
--- a/public/app/core/controllers/error_ctrl.js
+++ b/public/app/core/controllers/error_ctrl.js
@@ -1,19 +1,21 @@
 define([
   'angular',
+  'app/core/config',
   '../core_module',
 ],
-function (angular, coreModule) {
+function (angular, config, coreModule) {
   'use strict';
 
   coreModule.default.controller('ErrorCtrl', function($scope, contextSrv, navModelSrv) {
 
     $scope.navModel = navModelSrv.getNotFoundNav();
+    $scope.appSubUrl = config.appSubUrl;
 
     var showSideMenu = contextSrv.sidemenu;
     contextSrv.sidemenu = false;
 
     $scope.$on('$destroy', function() {
-      $scope.contextSrv.sidemenu = showSideMenu;
+      contextSrv.sidemenu = showSideMenu;
     });
 
   });
diff --git a/public/app/partials/error.html b/public/app/partials/error.html
index 2f75581fca5..0750e860dd5 100644
--- a/public/app/partials/error.html
+++ b/public/app/partials/error.html
@@ -42,8 +42,8 @@
 						</div>
 						<div>
 							<h3>Sorry for the inconvenience</h3>
-							<p>Please go back to your <a href="#" class="error-link">home dashboard</a> and try again.</p>
-							<p>If the error persists, seek help on the <a href="#" class="error-link">community site</a>.</p>
+							<p>Please go back to your <a href="{{appSubUrl}}/" class="error-link">home dashboard</a> and try again.</p>
+							<p>If the error persists, seek help on the <a href="https://community.grafana.com" target="_blank" class="error-link">community site</a>.</p>
 						</div>
 					</div>
 				</div>
diff --git a/public/sass/pages/_errorpage.scss b/public/sass/pages/_errorpage.scss
index 63676417274..e18306ea05a 100644
--- a/public/sass/pages/_errorpage.scss
+++ b/public/sass/pages/_errorpage.scss
@@ -43,7 +43,7 @@
     line-height: 1rem;
 }
 
-.error-link {color: $yellow;}
+.error-link {color: $orange;}
 
 .error-minus {
     color: #7eb26d;
@@ -57,4 +57,4 @@
     line-height: 1rem;
 }
 
-.graph-text {margin: 0;}
\ No newline at end of file
+.graph-text {margin: 0;}
diff --git a/tslint.json b/tslint.json
index 2e93d80ad25..9e3a4f29747 100644
--- a/tslint.json
+++ b/tslint.json
@@ -2,8 +2,8 @@
   "rules": {
     "no-string-throw": true,
     "no-unused-expression": true,
-    "no-duplicate-variable": true,
 		"no-unused-variable": true,
+    "no-duplicate-variable": true,
     "curly": true,
     "class-name": true,
     "semicolon": [true, "always", "ignore-bound-class-methods"],