diff --git a/fitbit/api.py b/fitbit/api.py
index 7a7a20d..3730b84 100644
--- a/fitbit/api.py
+++ b/fitbit/api.py
@@ -2,6 +2,7 @@
 import datetime
 import json
 import requests
+from oauthlib.oauth2 import MissingTokenError
 
 try:
     from urllib.parse import urlencode
@@ -26,6 +27,7 @@ class FitbitOauth2Client(object):
     authorization_url = "%s/oauth2/authorize" % AUTHORIZE_ENDPOINT
     access_token_url = request_token_url
     refresh_token_url = request_token_url
+    token = None
 
     def __init__(self, client_id, client_secret,
                  access_token=None, refresh_token=None,
@@ -82,6 +84,8 @@ def make_request(self, url, data={}, method=None, **kwargs):
                         self.refresh_token()
                         auth = OAuth2(client_id=self.client_id, token=self.token)
                         response = self._request(method, url, data=data, auth=auth, **kwargs)
+            except MissingTokenError as e:
+                raise e
             except:
                 pass