diff --git a/cla-backend/cla/controllers/github_application.py b/cla-backend/cla/controllers/github_application.py
index ff47d8c42..99244a8ad 100644
--- a/cla-backend/cla/controllers/github_application.py
+++ b/cla-backend/cla/controllers/github_application.py
@@ -76,13 +76,12 @@ def create_check_run(self, repository_name, data):
 
 class GithubCLAIntegration(GithubIntegration):
     """
-    Custom GithubIntegration using python-jose instead of pyjwt for token creation.
+    Custom GithubIntegration using PyJWT for token creation.
     """
 
     def create_jwt(self):
         """
-        Overloaded to use python-jose instead of pyjwt.
-        Couldn't get it working with pyjwt.
+        Overloaded to use PyJWT for token creation.
         """
         now = int(time.time())
         payload = {
diff --git a/cla-backend/cla/user.py b/cla-backend/cla/user.py
index d9075cfdd..f510dff97 100644
--- a/cla-backend/cla/user.py
+++ b/cla-backend/cla/user.py
@@ -46,7 +46,7 @@ def cla_user(default=None, request=None, **kwargs):
                 'verify_jti': False,
             },
         )
-    except Exception as e:
+    except PyJWTError as e:
         cla.log.error('Error parsing Bearer token: {}'.format(e))
         return default