diff --git a/src/controller/mainController.py b/src/controller/mainController.py
index 1827245c..7b6af496 100644
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -994,7 +994,8 @@ class Controller(object):
     if buffer != None: break
   else:
    buffer = self.view.search("home_timeline", buf.session.db["user_name"])
-  self.view.change_buffer(buffer)
+  if buffer!=None:
+   self.view.change_buffer(buffer)
 
  def up(self, *args, **kwargs):
   page = self.get_current_buffer()
diff --git a/src/sessionmanager/session.py b/src/sessionmanager/session.py
index 959894a2..f0e7f693 100644
--- a/src/sessionmanager/session.py
+++ b/src/sessionmanager/session.py
@@ -135,11 +135,15 @@ class Session(object):
   if the user account isn't authorised, it needs to call self.authorise() before login."""
 
   if self.settings["twitter"]["user_key"] != None and self.settings["twitter"]["user_secret"] != None:
-   log.debug("Logging in to twitter...")
-   self.twitter.login(self.settings["twitter"]["user_key"], self.settings["twitter"]["user_secret"], verify_credentials)
-   self.logged = True
-   log.debug("Logged.")
-   self.counter = 0
+   try:
+    log.debug("Logging in to twitter...")
+    self.twitter.login(self.settings["twitter"]["user_key"], self.settings["twitter"]["user_secret"], verify_credentials)
+    self.logged = True
+    log.debug("Logged.")
+    self.counter = 0
+   except:
+    log.error("The login attempt failed.")
+    self.logged = False
   else:
    self.logged = False
    raise Exceptions.RequireCredentialsSessionError