diff --git a/src/js/index.js b/src/js/index.js
index 4044c2257..7d9e6e0eb 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -396,6 +396,40 @@ app.filter('taskName', function () {
     };
 });
 
+app.filter('errorSuggestion', function () {
+    // from boxerror.js
+    var ACCESS_DENIED = 'Access Denied';
+    var ALREADY_EXISTS = 'Already Exists';
+    var BAD_FIELD = 'Bad Field';
+    var COLLECTD_ERROR = 'Collectd Error';
+    var CONFLICT = 'Conflict';
+    var DATABASE_ERROR = 'Database Error';
+    var DNS_ERROR = 'DNS Error';
+    var DOCKER_ERROR = 'Docker Error';
+    var EXTERNAL_ERROR = 'External Error';
+    var FS_ERROR = 'FileSystem Error';
+    var INTERNAL_ERROR = 'Internal Error';
+    var LOGROTATE_ERROR = 'Logrotate Error';
+    var NETWORK_ERROR = 'Network Error';
+    var NOT_FOUND = 'Not found';
+    var REVERSEPROXY_ERROR = 'ReverseProxy Error';
+    var TASK_ERROR = 'Task Error';
+    var UNKNOWN_ERROR = 'Unknown Error'; // only used for porting
+
+    return function (error) {
+        switch (error.reason) {
+        case COLLECTD_ERROR: return 'Check if collectd is running on the server';
+        case DATABASE_ERROR: return 'Check if MySQL database is running on the server';
+        case DOCKER_ERROR: return 'Check if docker is running on the server';
+        case DNS_ERROR: return 'Check if the DNS service of the domain is running';
+        case LOGROTATE_ERROR: return 'Check if logrotate is running on the server';
+        case NETWORK_ERROR: return 'Check if there are any network issues on the server';
+        case REVERSEPROXY_ERROR: return 'Check if nginx is running on the server';
+        default: return '';
+        }
+    };
+});
+
 app.filter('readyToUpdate', function () {
     return function (apps) {
         return apps.every(function (app) {
diff --git a/src/views/app.html b/src/views/app.html
index 93b4bfc9d..a18d0f219 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -112,7 +112,7 @@
       </div>
       <div class="modal-body">
         <p>The <b>{{ app.error.task | taskName }}</b> operation failed. Click repair to retry.</p>
-        <p class="text-danger">{{ app.error.message }}</p>
+        <p class="text-danger">{{ app.error.reason + ': ' + app.error.message }}</p>
         <div class="form-group" ng-show="repair.location && repair.domain">
             <label class="control-label">Location</label>
             <div class="input-group form-inline">
@@ -719,7 +719,8 @@
             <label class="control-label">Repair</label>
             <p>Use the repair button to retry failed operations.</p>
 
-            <p ng-show="app.error">An error occurred during the <b>{{ app.error.task | taskName }}</b> operation: <span class="text-danger"><b>{{ app.error.message }}</b></span></p>
+            <p ng-show="app.error">An error occurred during the <b>{{ app.error.task | taskName }}</b> operation: <span class="text-danger"><b>{{ app.error.reason + ': ' + app.error.message }}</b></span></p>
+            <p ng-show="app.error" class="text-info"><b>{{ app.error | errorSuggestion }}</b></p>
             <button class="btn btn-success pull-right" ng-click="repair.show()" ng-disabled="!app.error">Repair</button>
 
             <button class="btn btn-danger pull-right" ng-click="debug.stopAppTask(app.taskId)" ng-show="app.taskId">Cancel Current Task</button>