2 files changed, 8 insertions, 0 deletions
diff --git a/ishtar_common/templates/500.html b/ishtar_common/templates/500.html
index f48c2393d..9815a17f4 100644
--- a/ishtar_common/templates/500.html
+++ b/ishtar_common/templates/500.html
@@ -19,8 +19,10 @@
     </header>
     <div class="container">
         {% block content %}
+        {% block error %}
         <h3>{% trans "An error has occured. The support team has been warned." %}</h3>
         {% endblock %}
+        {% endblock %}
         <p><a href='/'>{% trans "Back to main page" %}</a></p>
     </div>
     <div id="footer">
diff --git a/ishtar_common/templates/error.html b/ishtar_common/templates/error.html
new file mode 100644
index 000000000..069796184
--- /dev/null
+++ b/ishtar_common/templates/error.html
@@ -0,0 +1,6 @@
+{% extends "500.html" %}
+{% load i18n %}
+{% block error %}
+<h3>{{error_title}}</h3>
+<p>{{error}}</p>
+{% endblock %}