diff --git a/Streetwriters.Identity/Services/CustomIntrospectionResponseGenerator.cs b/Streetwriters.Identity/Services/CustomIntrospectionResponseGenerator.cs
index 92342c8..33fc89e 100644
--- a/Streetwriters.Identity/Services/CustomIntrospectionResponseGenerator.cs
+++ b/Streetwriters.Identity/Services/CustomIntrospectionResponseGenerator.cs
@@ -46,6 +46,7 @@ namespace Streetwriters.Identity.Services
             if (result.TryGetValue("sub", out object userId))
             {
                 var user = await UserManager.FindByIdAsync(userId.ToString());
+                if (user == null || user.Claims == null) return result;
 
                 var verifiedClaim = user.Claims.Find((c) => c.ClaimType == "verified");
                 if (verifiedClaim != null)