diff --git a/r2/r2/models/token.py b/r2/r2/models/token.py
index 218e6476c..3eb7482f6 100644
--- a/r2/r2/models/token.py
+++ b/r2/r2/models/token.py
@@ -643,6 +643,9 @@ class OAuth2AccessToken(Token):
             client = OAuth2Client._byID(self.client_id)
             if getattr(client, 'deleted', False):
                 raise NotFound
+        except AttributeError:
+            g.log.error("bad token %s: %s", self, self._t)
+            raise
         except NotFound:
             return False