diff --git a/AUTHORS b/AUTHORS
index af26d71d28..77f6240b44 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,6 +37,7 @@ answer newbie questions, and generally made Django that much better:
     Paul Bissex <http://e-scribe.com/>
     Simon Blanchard
     Andrew Brehaut <http://brehaut.net/blog>
+    andy@jadedplanet.net
     Antonio Cavedoni <http://cavedoni.com/>
     C8E
     Amit Chakradeo <http://amit.chakradeo.net/>
diff --git a/django/views/debug.py b/django/views/debug.py
index 256f7cd662..c7a4e6bf7d 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -23,6 +23,7 @@ def get_template_exception_info(exc_type, exc_value, tb):
     line = 0
     upto = 0
     source_lines = []
+    before = during = after = ""
     for num, next in enumerate(linebreak_iter(template_source)):
         if start >= upto and end <= next:
             line = num