diff --git a/src/FrontOffice.Main/Pages/Profile/ChargeCreditWallet.razor.cs b/src/FrontOffice.Main/Pages/Profile/ChargeCreditWallet.razor.cs
index 0cd1561..4237af7 100644
--- a/src/FrontOffice.Main/Pages/Profile/ChargeCreditWallet.razor.cs
+++ b/src/FrontOffice.Main/Pages/Profile/ChargeCreditWallet.razor.cs
@@ -38,7 +38,7 @@ public partial class ChargeCreditWallet : ComponentBase
     {
         if (firstRender && !string.IsNullOrEmpty(_pendingReturnUrl))
         {
-            await CreditChargeNavigation.SaveReturnUrlAsync(jsRuntime, _pendingReturnUrl);
+            await CreditChargeNavigation.SaveReturnUrlAsync(JSRuntime, _pendingReturnUrl);
         }
 
         await base.OnAfterRenderAsync(firstRender);
@@ -54,10 +54,10 @@ public partial class ChargeCreditWallet : ComponentBase
         try
         {
             if (!string.IsNullOrEmpty(_pendingReturnUrl))
-                await CreditChargeNavigation.SaveReturnUrlAsync(jsRuntime, _pendingReturnUrl);
+                await CreditChargeNavigation.SaveReturnUrlAsync(JSRuntime, _pendingReturnUrl);
             else
             {
-                var storedReturnUrl = await CreditChargeNavigation.GetReturnUrlAsync(jsRuntime);
+                var storedReturnUrl = await CreditChargeNavigation.GetReturnUrlAsync(JSRuntime);
                 if (CreditChargeNavigation.IsValidReturnUrl(storedReturnUrl))
                     _pendingReturnUrl = storedReturnUrl;
             }
@@ -86,8 +86,8 @@ public partial class ChargeCreditWallet : ComponentBase
 
     private async Task ContinueShoppingAsync()
     {
-        var returnUrl = await CreditChargeNavigation.GetReturnUrlAsync(jsRuntime);
-        await CreditChargeNavigation.ClearReturnUrlAsync(jsRuntime);
+        var returnUrl = await CreditChargeNavigation.GetReturnUrlAsync(JSRuntime);
+        await CreditChargeNavigation.ClearReturnUrlAsync(JSRuntime);
 
         if (CreditChargeNavigation.IsValidReturnUrl(returnUrl))
             Navigation.NavigateTo(returnUrl!);
diff --git a/src/FrontOffice.Main/Pages/Store/CheckoutSummary.razor.cs b/src/FrontOffice.Main/Pages/Store/CheckoutSummary.razor.cs
index 3841807..19805ec 100644
--- a/src/FrontOffice.Main/Pages/Store/CheckoutSummary.razor.cs
+++ b/src/FrontOffice.Main/Pages/Store/CheckoutSummary.razor.cs
@@ -143,7 +143,7 @@ public partial class CheckoutSummary : ComponentBase
             });
 
         var result = await dialog.Result;
-        if (result is { Canceled: false, Data: long chargeShortfall })
+        if (result is { Canceled: false } && result.Data is long chargeShortfall)
         {
             var chargeAmount = CreditChargeNavigation.NormalizeChargeAmount(chargeShortfall);
             Navigation.NavigateTo(CreditChargeNavigation.BuildChargeUrl(