diff --git a/admin-dev/themes/template/not_found/content.tpl b/admin-dev/themes/template/not_found/content.tpl
new file mode 100644
index 000000000..1a46b3c27
--- /dev/null
+++ b/admin-dev/themes/template/not_found/content.tpl
@@ -0,0 +1,5 @@
+<h1>{l s='The controller'} {$controller} {l s='is missing or invalid. '}</h1>
+<ul>
+<li><a href="index.php">{l s='Go to Dashboard'}</a></li>
+<li><a href="#" onclick="window.history.back();">{l s='Back to previous page'}</a></li>
+</ul>
diff --git a/controllers/admin/AdminNotFoundController.php b/controllers/admin/AdminNotFoundController.php
new file mode 100644
index 000000000..9d91c0da3
--- /dev/null
+++ b/controllers/admin/AdminNotFoundController.php
@@ -0,0 +1,13 @@
+<?php
+
+class AdminNotFoundControllerCore extends AdminController
+{
+	public function initContent()
+	{
+		$this->_errors[] = Tools::displayError('Controller not found');
+		$tpl_vars['controller'] = Tools::getvalue('controller');
+
+		$this->context->smarty->assign($tpl_vars);
+		parent::initContent();
+	}
+}