diff --git a/application/app/Resources/TwigBundle/views/Exception/error.html.twig b/application/app/Resources/TwigBundle/views/Exception/error.html.twig
new file mode 100644
index 000000000..af7c1d63c
--- /dev/null
+++ b/application/app/Resources/TwigBundle/views/Exception/error.html.twig
@@ -0,0 +1,106 @@
+
+
+
+
+{% block error %}
+
{{ status_code }}
+
+ {% block error_text %} {{ status_text }} {% endblock %}
+
+
+
+{% endblock %}
+
+{% block information %}
+
+ You may want to head back to the Welcome page.
+ {% if fom.server_admin is defined %}
+ If you think something is broken, contact an Admin.
+ {% endif %}
+
+{% endblock %}
+
+{% block buttons %}
+
+{% endblock %}
+
+
+
+
diff --git a/application/app/Resources/TwigBundle/views/Exception/error404.html.twig b/application/app/Resources/TwigBundle/views/Exception/error404.html.twig
new file mode 100644
index 000000000..6189fc44d
--- /dev/null
+++ b/application/app/Resources/TwigBundle/views/Exception/error404.html.twig
@@ -0,0 +1,2 @@
+{% extends '@Twig/Exception/error.html.twig' %}
+{% block error_text %} Oops, the page you're looking for does not exist. {% endblock %}