diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs
index f9a6ca903e..9203467a5a 100644
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs
@@ -20,7 +20,7 @@ namespace Volo.Abp.Authorization.Permissions
 
         public override async Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
         {
-            var userId = CurrentUser.Id.ToString();
+            var userId = CurrentUser.Id?.ToString();
 
             if (userId == null)
             {
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs
index c2e28d1222..61e49cea81 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs
@@ -18,7 +18,7 @@ namespace Volo.Abp.MultiTenancy
             }
 
             context.Handled = true;
-            context.TenantIdOrName = currentUser.TenantId.ToString();
+            context.TenantIdOrName = currentUser.TenantId?.ToString();
         }
     }
 }
\ No newline at end of file