diff --git a/lib/travis/api/app/endpoint/authorization.rb b/lib/travis/api/app/endpoint/authorization.rb
index 35f95b01..0004a82f 100644
--- a/lib/travis/api/app/endpoint/authorization.rb
+++ b/lib/travis/api/app/endpoint/authorization.rb
@@ -227,7 +227,9 @@ class Travis::Api::App
         def get_token(endoint, values)
           response   = Faraday.post(endoint, values)
           parameters = Addressable::URI.form_unencode(response.body)
-          parameters.assoc("access_token").last
+          token_info = parameters.assoc("access_token")
+          halt 401, 'could not resolve github token' unless token_info
+          token_info.last
         end
 
         def parse_scopes(data)
@@ -434,6 +436,6 @@ if(window.parent == window) {
   <form action="<%= uri %>" method='post'>
     <input type='hidden' name='token'   value='<%= token %>'>
     <input type='hidden' name='user'    value="<%= user.to_json.gsub('"', '&quot;') %>">
-    <input type='hidden' name='storage' value='sessionStorage'>
+    <input type='hidden' name='storage' value='localStorage'>
   </form>
 </body>