diff --git a/pandora/settings.py b/pandora/settings.py
index cc6b8e76..44ae9b0d 100644
--- a/pandora/settings.py
+++ b/pandora/settings.py
@@ -103,8 +103,8 @@ MIDDLEWARE = (
     'django.contrib.messages.middleware.MessageMiddleware',
     'oxdjango.middleware.ExceptionMiddleware',
     'oxdjango.middleware.ChromeFrameMiddleware',
-    'user.middleware.TokenSession',
     'user.middleware.UpdateSession',
+    'user.middleware.TokenSession',
 )
 
 ROOT_URLCONF = 'urls'
diff --git a/pandora/user/middleware.py b/pandora/user/middleware.py
index d6b71c52..75e5acde 100644
--- a/pandora/user/middleware.py
+++ b/pandora/user/middleware.py
@@ -8,9 +8,11 @@ class UpdateSession(MiddlewareMixin):
 
     def process_request(self, request):
         if request.user.is_authenticated:
-            expire_date = Session.objects.get(session_key=request.session.session_key).expire_date
-            if (request.session.get_expiry_date() - expire_date).total_seconds() > settings.SESSION_UPDATE:
-                request.session.modified = True
+            session = Session.objects.filter(session_key=request.session.session_key).first()
+            if session:
+                expire_date = session.expire_date
+                if (request.session.get_expiry_date() - expire_date).total_seconds() > settings.SESSION_UPDATE:
+                    request.session.modified = True
 
     def process_response(self, request, response):
         return response
@@ -28,7 +30,6 @@ class TokenSession(MiddlewareMixin):
         if value:
             token = models.AccessToken.objects.filter(value=value).first()
             if token:
-                #django.contrib.auth.login(request, token.user)
                 request.user = token.user
 
     def process_response(self, request, response):