diff --git a/py/selenium/webdriver/common/virtual_authenticator.py b/py/selenium/webdriver/common/virtual_authenticator.py
index b567a72a35b5c..f6b0f4e926ac0 100644
--- a/py/selenium/webdriver/common/virtual_authenticator.py
+++ b/py/selenium/webdriver/common/virtual_authenticator.py
@@ -180,7 +180,7 @@ def to_dict(self) -> dict[str, Any]:
     def from_dict(cls, data: dict[str, Any]) -> "Credential":
         _id = urlsafe_b64decode(f"{data['credentialId']}==")
         is_resident_credential = bool(data["isResidentCredential"])
-        rp_id = data.get("rpId", None)
+        rp_id = data["rpId"]
         private_key = urlsafe_b64decode(f"{data['privateKey']}==")
         sign_count = int(data["signCount"])
         user_handle = urlsafe_b64decode(f"{data['userHandle']}==") if data.get("userHandle", None) else None
diff --git a/py/selenium/webdriver/remote/errorhandler.py b/py/selenium/webdriver/remote/errorhandler.py
index 9a100e20543f5..5a2b8f038f9b7 100644
--- a/py/selenium/webdriver/remote/errorhandler.py
+++ b/py/selenium/webdriver/remote/errorhandler.py
@@ -173,7 +173,7 @@ def check_response(self, response: dict[str, Any]) -> None:
                             message = value.get("value") or value.get("message")
                             if not isinstance(message, str):
                                 value = message
-                                message = message.get("message")
+                                message = message.get("message") if isinstance(message, dict) else None
                         else:
                             message = value.get("message", None)
                 except ValueError: