From e35faf1335c85fc22d5762db99f99b6598b815c9 Mon Sep 17 00:00:00 2001
From: Addison Beck <abeck@bitwarden.com>
Date: Fri, 13 Nov 2020 08:53:36 -0500
Subject: [PATCH] Performed some null checks (#991)

---
 src/Core/IdentityServer/CustomTokenRequestValidator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/IdentityServer/CustomTokenRequestValidator.cs b/src/Core/IdentityServer/CustomTokenRequestValidator.cs
index 7032e6c88c..375c6c6d1a 100644
--- a/src/Core/IdentityServer/CustomTokenRequestValidator.cs
+++ b/src/Core/IdentityServer/CustomTokenRequestValidator.cs
@@ -54,7 +54,7 @@ namespace Bit.Core.IdentityServer
         protected async override Task<(User, bool)> ValidateContextAsync(CustomTokenRequestValidationContext context)
         {
             var email = context.Result.ValidatedRequest.Subject?.GetDisplayName() 
-                ?? context.Result.ValidatedRequest.ClientClaims.FirstOrDefault(claim => claim.Type == JwtClaimTypes.Email).Value;
+                ?? context.Result.ValidatedRequest.ClientClaims?.FirstOrDefault(claim => claim.Type == JwtClaimTypes.Email)?.Value;
             var user = await _userManager.FindByEmailAsync(email);
             return (user, user != null);
         }