diff --git a/VERSION b/VERSION
index caaf3704..7b2a0df5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.5 (2012-03-02 10:04:06) stable
+Version 1.99.5 (2012-03-02 10:11:16) stable
diff --git a/gluon/template.py b/gluon/template.py
index 20e08365..b3638a0a 100644
--- a/gluon/template.py
+++ b/gluon/template.py
@@ -289,10 +289,11 @@ class TemplateParser(object):
         if delimiters != self.default_delimiters:
             escaped_delimiters = (re.escape(delimiters[0]),re.escape(delimiters[1]))
             self.r_tag = re.compile(r'(%s.*?%s)' % escaped_delimiters, re.DOTALL)
-        elif context['response'].delimiters != self.default_delimiters:
-            escaped_delimiters = (re.escape(context['response'].delimiters[0]),
-                                  re.escape(context['response'].delimiters[1]))
-            self.r_tag = re.compile(r'(%s.*?%s)' % escaped_delimiters, re.DOTALL)
+        elif context.has_key('response'):
+            if context['response'].delimiters != self.default_delimiters:
+                escaped_delimiters = (re.escape(context['response'].delimiters[0]),
+                                      re.escape(context['response'].delimiters[1]))
+                self.r_tag = re.compile(r'(%s.*?%s)' % escaped_delimiters,re.DOTALL)
 
         # Create a root level Content that everything will go into.
         self.content = Content(name=name)