diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index cf97cd4dc..f2f6aa6cf 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -30,7 +30,8 @@
 
 # namespace Icinga\Application\Controllers;
 
-use \Icinga\Web\Controller\ActionController;
+use Icinga\Web\Controller\ActionController;
+use Icinga\Application\Icinga;
 
 /**
  * Application wide controller for displaying exceptions
@@ -50,17 +51,29 @@ class ErrorController extends ActionController
             case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ROUTE:
             case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER:
             case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ACTION:
+                $modules = Icinga::app()->getModuleManager();
+                $path = ltrim($this->_request->get('PATH_INFO'), '/');
+                $path = preg_split('~/~', $path);
+                $path = array_shift($path);
                 $this->getResponse()->setHttpResponseCode(404);
-                $this->view->message = 'Page not found';
+                $this->view->message = $this->translate('Page not found.');
+                if ($modules->hasInstalled($path) && ! $modules->hasEnabled($path)) {
+                    $this->view->message .= ' ' . sprintf(
+                        $this->translate('Enabling the "%s" module might help!'),
+                        $path
+                    );
+                }
+
                 break;
             default:
                 $this->getResponse()->setHttpResponseCode(500);
+                $this->view->title = 'Server error';
                 $this->view->message = $exception->getMessage();
+                if ($this->getInvokeArg('displayExceptions') == true) {
+                    $this->view->stackTrace = $exception->getTraceAsString();
+                }
                 break;
         }
-        if ($this->getInvokeArg('displayExceptions') == true) {
-            $this->view->stackTrace = $exception->getTraceAsString();
-        }
         $this->view->request = $error->request;
     }
 }
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index 44938e86d..fb2c8f451 100644
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -1,7 +1,13 @@
-<h1 class="alert alert-danger"><?= $message ?></h1>
+<?php if ($this->title): ?>
+<div class="controls">
+<h1><?= $this->escape($title) ?></h1>
+</div>
+<?php endif ?>
+<div class="content">
+  <p><strong><?= $this->escape($message) ?></strong></p>
 <?php if (isset($stackTrace)) : ?>
   <hr />
-  <pre><?= $stackTrace ?></pre>
+  <pre><?= $this->escape($stackTrace) ?></pre>
 <?php endif ?>
 <?php if (isset($this->messageBox)) : ?>
   <?= $this->messageBox->render(); ?>