diff --git a/src/clearpass/client.py b/src/clearpass/client.py
index b409e15..98ff5a1 100644
--- a/src/clearpass/client.py
+++ b/src/clearpass/client.py
@@ -83,10 +83,11 @@ def _get_access_token(self):
             verify=False,
         )
         if res.status_code != 200:
-            logger.warning("Request for authentication returned HTTP "
-                           f"{res.status_code}: {res.reason}")
+            error_message = "Request for authentication returned HTTP " \
+                            f"{res.status_code}: {res.reason}"
+            logger.warning(error_message)
             if res.status_code < 200 or res.status_code > 299:
-                raise TokenError()
+                raise TokenError(error_message)
         retjson = res.json()
         return retjson["access_token"]
 
@@ -94,7 +95,7 @@ def test_connectivity(self):
         try:
             self._get_access_token()
             return True
-        except Exception:
+        except TokenError:
             return False
 
     @property
diff --git a/src/clearpass/exceptions.py b/src/clearpass/exceptions.py
index cd8e73e..9a5fb1d 100644
--- a/src/clearpass/exceptions.py
+++ b/src/clearpass/exceptions.py
@@ -3,6 +3,5 @@ class ClearPassAPI(Exception):
 
 
 class TokenError(ClearPassAPI):
-    def __init__(self) -> None:
-        mesg = "Could not retrieve access token."
-        super().__init__(mesg)
+    def __init__(self, msg="Could not retrieve access token.") -> None:
+        super().__init__(msg)