diff --git a/MidrandBookshop/HydrationService.cs b/MidrandBookshop/HydrationService.cs
index 3939f7d..ca531c4 100644
--- a/MidrandBookshop/HydrationService.cs
+++ b/MidrandBookshop/HydrationService.cs
@@ -38,13 +38,13 @@ public sealed class HydrationService(AuthenticationStateProvider authStateProvid
 
         if (existingCustomer.IsFailed)
         {
-            var name = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name)!.Value!;
-            var lastname = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Surname)!.Value!;
-            var mobile = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.MobilePhone)!.Value!;
+            var name = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name)?.Value ?? string.Empty;
+            var lastname = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Surname)?.Value ?? string.Empty;
+            var mobile = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.MobilePhone)?.Value ?? string.Empty;
 
             var customerCreate = await customerService.CreateCustomerAsync(new CreateCustomer { Email = email }, cancellationToken);
 
-            if (customerCreate.IsSuccess)
+            if (customerCreate.IsSuccess && !string.IsNullOrWhiteSpace(name))
             {
                 ShoppingCart.CustomerId = customerCreate.Value;