diff --git a/.github/workflows/TestOnPR.yml b/.github/workflows/TestOnPR.yml
index 598248fd..486ee422 100644
--- a/.github/workflows/TestOnPR.yml
+++ b/.github/workflows/TestOnPR.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Download generated python artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: packages
           path: dist
diff --git a/dal/classes/utils/token.py b/dal/classes/utils/token.py
index 3255abe8..7102a3ab 100644
--- a/dal/classes/utils/token.py
+++ b/dal/classes/utils/token.py
@@ -283,6 +283,8 @@ def verify_token(cls, token: str) -> None:
         if not isinstance(token, str):
             error_msg = "Token must be a string!"
             raise TokenError(error_msg)
+
+        token_id = None
         try:
             token_id = cls.get_token_id(token)
             #cls.log.debug(f"Verifying token id {token_id}")
@@ -293,7 +295,8 @@ def verify_token(cls, token: str) -> None:
         except (jwt.ExpiredSignatureError, jwt.DecodeError, jwt.InvalidTokenError)  as e:
             error_msg = f"Failed to verify token: {e}"
             cls.log.warning(error_msg)
-            cls._token_manager.remove_token(token_id)
+            if token_id is not None:
+                cls._token_manager.remove_token(token_id)
             raise TokenExpired(error_msg)
 
     @classmethod
@@ -429,4 +432,4 @@ def generate_refresh_token(cls, user: BaseUser) -> str:
         """
         return cls._generate_user_token(user, "Refresh", JWT_REFRESH_EXPIRATION_DELTA)
 
- 
\ No newline at end of file
+