diff --git a/routes/__init__.py b/routes/__init__.py
index be45f61..f96badc 100644
--- a/routes/__init__.py
+++ b/routes/__init__.py
@@ -82,8 +82,8 @@ def login(account_id):
 @app.route('/login/twitter/callback')
 def twitter_login_step2():
     try:
-        oauth_token = request.args['oauth_token']
-        oauth_verifier = request.args['oauth_verifier']
+        oauth_token = request.args.get('oauth_token', '')
+        oauth_verifier = request.args.get('oauth_verifier', '')
         token = libforget.twitter.receive_verifier(
                 oauth_token, oauth_verifier,
                 **app.config.get_namespace("TWITTER_"))
@@ -92,7 +92,7 @@ def twitter_login_step2():
 
         g.viewer = session
         return redirect(url_for('index'))
-    except (TwitterError, URLError):
+    except Exception:
         if sentry:
             sentry.captureException()
         return redirect(
diff --git a/templates/about.html b/templates/about.html
index 97b07cd..e0604e5 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -23,7 +23,7 @@
 <h2 id="sign_in">Sign in</h2>
 {% if twitter_login_error %}
 <div class="banner error">
-    Sorry, something went wrong when communicating with Twitter. Give it another shot, maybe?
+    Sorry, something went wrong when logging you in with Twitter. Give it another shot, maybe?
 </div>
 {% endif %}