diff --git a/src/views/graphs.html b/src/views/graphs.html
index 258da9dbe..083b43e46 100644
--- a/src/views/graphs.html
+++ b/src/views/graphs.html
@@ -2,7 +2,7 @@
 
   <div class="row" ng-if="errorMessage">
     <br>
-    <div class="alert alert-danger text-center">
+    <div class="alert alert-warning text-center">
       {{ errorMessage }}
     </div>
   </div>
diff --git a/src/views/graphs.js b/src/views/graphs.js
index 29cf71321..07f1abf0b 100644
--- a/src/views/graphs.js
+++ b/src/views/graphs.js
@@ -39,7 +39,7 @@ angular.module('Application').controller('GraphsController', ['$scope', '$locati
     }
 
     $scope.setError = function (context, error) {
-        $scope.errorMessage = 'Error loading ' + context + ' stats : ' + error.message + '. Try restarting the graphite service.';
+        $scope.errorMessage = 'Error loading ' + context + ' : ' + error.message;
     };
 
     $scope.setMemoryApp = function (app, color) {
diff --git a/src/views/system.html b/src/views/system.html
index c4aa7927e..00a228554 100644
--- a/src/views/system.html
+++ b/src/views/system.html
@@ -64,6 +64,13 @@
   </div>
 
   <div class="card card-large">
+    <div class="row" ng-if="errorMessage">
+      <br>
+      <div class="alert alert-warning text-center">
+        {{ errorMessage }}
+      </div>
+    </div>
+
     <div class="row ng-hide" ng-show="disks.length === 0">
       <div class="col-md-12 text-center">
         <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
diff --git a/src/views/system.js b/src/views/system.js
index 0f778a86f..9a969cef6 100644
--- a/src/views/system.js
+++ b/src/views/system.js
@@ -11,6 +11,11 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
     $scope.services = [];
     $scope.disks = [];
     $scope.memory = null;
+    $scope.errorMessage = '';
+
+    $scope.setError = function (context, error) {
+        $scope.errorMessage = 'Error loading ' + context + ' : ' + error.message;
+    };
 
     // http://stackoverflow.com/questions/1484506/random-color-generator-in-javascript
     function getRandomColor() {