diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html
index 1da3f87d..00e44f4c 100644
--- a/edivorce/apps/core/templates/dashboard/print_form.html
+++ b/edivorce/apps/core/templates/dashboard/print_form.html
@@ -7,6 +7,16 @@
 
 {% block content %}
     <h1>Review and Print your Divorce Forms</h1>
+    {% if derived.any_errors %}
+        <div class="review-warning">
+            <div><span class="exclamation"><i class="fa fa-fw fa-exclamation-circle"></i></span></div>
+            <div>
+                At least one question in the <a href="{% url 'question_steps' 'review' %}">Questionnaire</a> portion of this application is incomplete.
+                Generally, filing incomplete forms will cause your filing to be rejected by the Court Registry.
+                We recommend you go back to the <a href="{% url 'question_steps' 'review' %}">Questionnaire</a> and complete all pages.
+            </div>
+        </div>
+    {% endif %}
     <p>
         To get divorced, you need to get a divorce order. Only the court has the
         ability to divorce a married couple. To get a court order you have to
@@ -489,8 +499,10 @@
                 ">Completed Identification of Applicant (VSA 512)<i class="fa fa-question-circle" aria-hidden="true"></i></span>
                     for anyone requesting a name change
                     <ul>
-                        {% if name_change_you == 'YES' %}<li>Claimant 1 ({% you_name %})</li>{% endif %}
-                        {% if name_change_spouse == 'YES' %}<li>Claimant 2 ({% spouse_name %})</li>{% endif %}
+                        {% if name_change_you == 'YES' %}
+                            <li>Claimant 1 ({% you_name %})</li>{% endif %}
+                        {% if name_change_spouse == 'YES' %}
+                            <li>Claimant 2 ({% spouse_name %})</li>{% endif %}
                     </ul>
                 </li>
             {% endif %}
diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py
index 0c127458..c421d03f 100644
--- a/edivorce/apps/core/views/main.py
+++ b/edivorce/apps/core/views/main.py
@@ -199,12 +199,16 @@ def dashboard_nav(request, nav_step):
     Dashboard: All other pages
     """
     responses_dict = get_data_for_user(request.user)
-    responses_dict['derived'] = get_derived_data(responses_dict)
     responses_dict['active_page'] = nav_step
     template_name = 'dashboard/%s.html' % nav_step
     if nav_step in ('print_form', 'swear_forms', 'next_steps') and responses_dict.get('court_registry_for_filing'):
         responses_dict['court_registry_for_filing_address'] = f"123 {responses_dict.get('court_registry_for_filing')} St"
         responses_dict['court_registry_for_filing_postal_code'] = 'V0A 1A1'
+    if nav_step in ('print_form',):
+        responses_dict_by_step = get_step_responses(responses_dict)
+        responses_dict.update(get_error_dict(responses_dict_by_step))
+
+    responses_dict['derived'] = get_derived_data(responses_dict)
     return render(request, template_name=template_name, context=responses_dict)