diff --git a/opentech/apply/funds/templates/funds/fund_type.html b/opentech/apply/funds/templates/funds/fund_type.html
index 9266ec9c826479de439b44dd1ef6fc67b0fcfd5f..8b61a7da8ef66e6687e719402ce64fadb51f8593 100644
--- a/opentech/apply/funds/templates/funds/fund_type.html
+++ b/opentech/apply/funds/templates/funds/fund_type.html
@@ -1,10 +1,24 @@
 {% extends "base.html" %}
-
 {% load wagtailcore_tags %}
+
 {% block content %}
     <h1>{{ page.title }}</h1>
+
     <form action="{% pageurl page %}" method="POST">
         {% csrf_token %}
+
+        {% if form.errors or form.non_field_errors %}
+            <div class="messages">
+                There were some errors with your form. Please amend the fields highlighted below. {% if form.non_field_errors %}
+                <ul>
+                    {% for error in form.non_field_errors %}
+                    <li class="error">{{ error }}</li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+            </div>
+        {% endif %}
+
         {{ form.as_p }}
         <input type="submit">
     </form>
diff --git a/opentech/public/forms/templates/public_forms/form_page.html b/opentech/public/forms/templates/public_forms/form_page.html
index 566f5506bee030a8faa8611476613ae88a1d9a51..cf64e1aec4b27045532b80dbbef5ac694f158bc1 100644
--- a/opentech/public/forms/templates/public_forms/form_page.html
+++ b/opentech/public/forms/templates/public_forms/form_page.html
@@ -18,8 +18,17 @@
                     <div>
                         {% csrf_token %}
 
-                        {% if form.errors %}
-                            There were some errors with your form. Please amend the fields highlighted below.
+                        {% if form.errors or form.non_field_errors %}
+                            <div class="messages">
+                                 There were some errors with your form. Please amend the fields highlighted below.
+                                 {% if form.non_field_errors %}
+                                <ul>
+                                    {% for error in form.non_field_errors %}
+                                    <li class="error">{{ error }}</li>
+                                    {% endfor %}
+                                </ul>
+                                 {% endif %}
+                            </div>
                         {% endif %}
 
                         {% for field in form %}