diff --git a/package.json b/package.json
index 67420c22b..c1572964f 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "build": "babel -s -d lib src && rimraf dist && mkdir dist && browserify -d browser-index.js | exorcist dist/browser-matrix.js.map > dist/browser-matrix.js && uglifyjs -c -m -o dist/browser-matrix.min.js --source-map dist/browser-matrix.min.js.map --in-source-map dist/browser-matrix.js.map dist/browser-matrix.js",
     "dist": "npm run build",
     "watch": "watchify -d browser-index.js -o 'exorcist dist/browser-matrix.js.map > dist/browser-matrix.js' -v",
-    "lint": "eslint --max-warnings 112 src spec",
+    "lint": "eslint --max-warnings 110 src spec",
     "prepublish": "npm run build && git rev-parse HEAD > git-revision.txt"
   },
   "repository": {
diff --git a/src/http-api.js b/src/http-api.js
index 38ec77819..68da46431 100644
--- a/src/http-api.js
+++ b/src/http-api.js
@@ -423,7 +423,8 @@ module.exports.MatrixHttpApi.prototype = {
         const self = this;
 
         requestPromise.catch(function(err) {
-            if (err.toString().indexOf("Error: CORS request rejected") != -1) {
+            if (err.errcode == 'M_MISSING_TOKEN' ||
+                    err.toString().indexOf("Error: CORS request rejected") != -1) {
                 self.authorization_header_supported = false;
                 queryParams.access_token = opts.headers.Authorization.substr(7);
                 delete opts.headers.Authorization;
@@ -431,6 +432,7 @@ module.exports.MatrixHttpApi.prototype = {
                     callback, method, path, queryParams, data, opts,
                 );
                 requestPromise.abort = secondPromise.abort;
+                return secondPromise;
             }
             if (err.errcode == 'M_UNKNOWN_TOKEN') {
                 self.event_emitter.emit("Session.logged_out");