Merge branch 'master' into tx-master

1 files changed, 6 insertions, 4 deletions

diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py
index d0a8c19..3f6aea5 100644
--- a/debug_toolbar/panels/request_vars.py
+++ b/debug_toolbar/panels/request_vars.py
@@ -10,10 +10,10 @@ class RequestVarsDebugPanel(DebugPanel):
 
     def nav_title(self):
         return 'Request Vars'
-    
+
     def title(self):
         return 'Request Vars'
-    
+
     def url(self):
         return ''
 
@@ -24,7 +24,9 @@ class RequestVarsDebugPanel(DebugPanel):
         context = {
             'get': [(k, self.request.GET.getlist(k)) for k in self.request.GET.iterkeys()],
             'post': [(k, self.request.POST.getlist(k)) for k in self.request.POST.iterkeys()],
-            'session': [(k, self.request.session.get(k)) for k in self.request.session.iterkeys()],
             'cookies': [(k, self.request.COOKIES.get(k)) for k in self.request.COOKIES.iterkeys()],
         }
-        return render_to_string('debug_toolbar/panels/request_vars.html', context)
\ No newline at end of file
+        if hasattr(self.request, 'session'):
+            context['session'] = [(k, self.request.session.get(k)) for k in self.request.session.iterkeys()]
+
+        return render_to_string('debug_toolbar/panels/request_vars.html', context)