diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py
index 9d6f59386..18dbab100 100644
--- a/modoboa/extensions/webmail/views.py
+++ b/modoboa/extensions/webmail/views.py
@@ -335,7 +335,7 @@ def listmailbox(request, defmailbox="INBOX", update_session=True):
     :return: a dictionnary
     """
     navparams = WebmailNavigationParameters(request, defmailbox)
-    previous_page_id = int(navparams["page"])
+    previous_page_id = int(navparams["page"]) if "page" in navparams else None
     if update_session:
         navparams.store()
     mbox = navparams.get('mbox')
diff --git a/modoboa/lib/webutils.py b/modoboa/lib/webutils.py
index 71fe27e51..852f02dbd 100644
--- a/modoboa/lib/webutils.py
+++ b/modoboa/lib/webutils.py
@@ -178,11 +178,13 @@ class NavigationParameters(object):
     def __getitem__(self, key):
         """Retrieve an item."""
         if self.sessionkey not in self.request.session:
-            return None
+            raise KeyError
         return self.request.session[self.sessionkey][key]
 
     def __contains__(self, key):
         """Check if key is present."""
+        if self.sessionkey not in self.request.session:
+            return False
         return key in self.request.session[self.sessionkey]
 
     def __setitem__(self, key, value):