diff --git a/VERSION b/VERSION
index 13ed50ea..d64ca6b5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.7 (2012-03-12 21:35:37) dev
+Version 1.99.7 (2012-03-12 21:59:21) dev
diff --git a/gluon/template.py b/gluon/template.py
index b3638a0a..efcea98f 100644
--- a/gluon/template.py
+++ b/gluon/template.py
@@ -289,7 +289,7 @@ 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.has_key('response'):
+        elif context.has_key('response') and hasattr(context['response'],'delimiters'):
             if context['response'].delimiters != self.default_delimiters:
                 escaped_delimiters = (re.escape(context['response'].delimiters[0]),
                                       re.escape(context['response'].delimiters[1]))