diff --git a/src/PasskeyError.ts b/src/PasskeyError.ts
index c882c08..7d9883d 100644
--- a/src/PasskeyError.ts
+++ b/src/PasskeyError.ts
@@ -79,8 +79,10 @@ export interface TNativeError {
   message?: string;
 }
 
-export function handleNativeError(_error: TNativeError): PasskeyError {
-  if (!_error.code) {
+export function handleNativeError(
+  _error: TNativeError | null | undefined
+): PasskeyError {
+  if (!_error?.code) {
     return UnknownError;
   }
 
@@ -115,6 +117,11 @@ function mapNativeErrorCode(code: string, _error: TNativeError): PasskeyError {
     case 'InvalidChallenge': {
       return InvalidChallengeError;
     }
+    case 'InvalidUser':
+    case 'InvalidUserId': {
+      return InvalidUserIdError;
+    }
+    case 'NotConfigured':
     case 'BadConfiguration': {
       return BadConfiguration;
     }