diff --git a/tests/template_error.py b/tests/template_error.py
new file mode 100644
index 0000000..793a96a
--- /dev/null
+++ b/tests/template_error.py
@@ -0,0 +1,15 @@
+from docxtpl import DocxTemplate, RichText
+from jinja2.exceptions import TemplateError
+
+try:
+    tpl = DocxTemplate('test_files/template_error_tpl.docx')
+    tpl.render({
+        'test_variable' : 'test variable value'
+    })
+except TemplateError as the_error:
+    print unicode(the_error)
+    if hasattr(the_error, 'docx_context'):
+        print "Context:"
+        for line in the_error.docx_context:
+            print line
+tpl.save('test_files/template_error.docx')
diff --git a/tests/test_files/template_error.docx b/tests/test_files/template_error.docx
new file mode 100644
index 0000000..44d1938
Binary files /dev/null and b/tests/test_files/template_error.docx differ
diff --git a/tests/test_files/template_error_tpl.docx b/tests/test_files/template_error_tpl.docx
new file mode 100644
index 0000000..c99e034
Binary files /dev/null and b/tests/test_files/template_error_tpl.docx differ