diff --git a/debug_toolbar/__init__.py b/debug_toolbar/__init__.py
index 90f9e2f24..1bd9cf5b7 100644
--- a/debug_toolbar/__init__.py
+++ b/debug_toolbar/__init__.py
@@ -1,2 +1,2 @@
-VERSION = (0, 8, 5)
+VERSION = (0, 8, 7)
 __version__ = '.'.join(map(str, VERSION))
diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py
index 956e02852..0696335f1 100644
--- a/debug_toolbar/panels/request_vars.py
+++ b/debug_toolbar/panels/request_vars.py
@@ -28,14 +28,20 @@ def process_view(self, request, view_func, view_args, view_kwargs):
 
     def content(self):
         context = self.context.copy()
-        context.update({
-            'get': [(k, self.request.GET.getlist(k)) for k in self.request.GET],
-            'post': [(k, self.request.POST.getlist(k)) for k in self.request.POST],
-            'cookies': [(k, self.request.COOKIES.get(k)) for k in self.request.COOKIES],
-            'view_func': '%s.%s' % (self.view_func.__module__, self.view_func.__name__),
-            'view_args': self.view_args,
-            'view_kwargs': self.view_kwargs
-        })
+
+        if self.request:
+             context.update({
+                'get': [(k, self.request.GET.getlist(k)) for k in self.request.GET],
+                'post': [(k, self.request.POST.getlist(k)) for k in self.request.POST],
+                'cookies': [(k, self.request.COOKIES.get(k)) for k in self.request.COOKIES],
+                })
+        if hasattr(self, 'view_args'):
+            context.update({ 'view_args': self.view_args })
+        if hasattr(self, 'view_kwargs'):
+            context.update({ 'view_kwargs': self.view_kwargs })
+        if hasattr(self, 'view_func'):
+            if hasattr(self.view_func,'__module__') and hasattr(self.view_func,'__name__'):
+                context.update({'view_func': '%s.%s' % (self.view_func.__module__, self.view_func.__name__)})
         if hasattr(self.request, 'session'):
             context.update({
                 'session': [(k, self.request.session.get(k)) for k in self.request.session.iterkeys()]
diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index 44b8b3e3e..39565d9ff 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -76,9 +76,9 @@ def content(self):
             # Clean up some info about templates
             template = template_data.get('template', None)
             # Skip templates that we are generating through the debug toolbar.
-            if template.name and template.name.startswith('debug_toolbar/'):
+            if hasattr(template, 'name') and template.name.startswith('debug_toolbar/'):
                 continue
-            if template.origin and template.origin.name:
+            if hasattr(template, 'origin') and hasattr(template.origin, 'name'):
                 template.origin_name = template.origin.name
             else:
                 template.origin_name = 'No origin'