diff --git a/ietf/dbtemplate/template.py b/ietf/dbtemplate/template.py
index 6ada20d08..02d8e9be3 100644
--- a/ietf/dbtemplate/template.py
+++ b/ietf/dbtemplate/template.py
@@ -10,6 +10,7 @@ import debug                            # pyflakes:ignore
 
 from django.template import Origin, TemplateDoesNotExist, Template as DjangoTemplate
 from django.template.loaders.base import Loader as BaseLoader
+from django.utils.safestring import mark_safe
 
 from ietf.dbtemplate.models import DBTemplate
 
@@ -53,9 +54,9 @@ class RSTTemplate(PlainTemplate):
                                       'halt_level': 2,
                                   })
         except SystemMessage as e:
-            e.message = e.message.replace('<string>:', 'line ')
+            e.message = mark_safe('<div class="danger preformatted">%s</div>' % str(e).replace('<string>:', 'line '))
             args = list(e.args)
-            args[0] = args[0].replace('<string>:', 'line ')
+            args[0] = mark_safe('<div class="danger preformatted">%s</div>' % args[0].replace('<string>:', 'line '))
             e.args = tuple(args)
             raise e
 
diff --git a/ietf/templates/nomcom/edit_template.html b/ietf/templates/nomcom/edit_template.html
index 827a105bb..bd53e8ba1 100644
--- a/ietf/templates/nomcom/edit_template.html
+++ b/ietf/templates/nomcom/edit_template.html
@@ -32,6 +32,9 @@
   </dl>
 
   <form id="templateform" method="post">
+    {% if form.errors %}
+      <p class="alert alert-danger">There were errors, see below.</p>
+    {% endif %}
     {% csrf_token %}
     {% bootstrap_form form %}