diff --git a/BTCPayServer/Controllers/UICustodianAccountsController.cs b/BTCPayServer/Controllers/UICustodianAccountsController.cs
index c3996ca9b..177c45d42 100644
--- a/BTCPayServer/Controllers/UICustodianAccountsController.cs
+++ b/BTCPayServer/Controllers/UICustodianAccountsController.cs
@@ -452,7 +452,7 @@ namespace BTCPayServer.Controllers
                     }
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return BadRequest();
             }
diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
index 4bfae0b3c..8b199e0a6 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
@@ -551,8 +551,7 @@ namespace BTCPayServer.Controllers
                         if (this.GetCurrentStore().Role != StoreRoles.Owner)
                             return Forbid();
                         
-                        var settings = (this.GetCurrentStore().GetDerivationSchemeSettings(_NetworkProvider, network.CryptoCode));
-                        var derivationScheme = settings.AccountDerivation;
+                        var derivationScheme = (this.GetCurrentStore().GetDerivationSchemeSettings(_NetworkProvider, network.CryptoCode))?.AccountDerivation;
                         if (derivationScheme is null)
                             return NotSupported("This feature is only available to BTC wallets");
                         var bumpableAddresses = (await GetAddresses(selectedItems))
diff --git a/BTCPayServer/Controllers/UIWalletsController.cs b/BTCPayServer/Controllers/UIWalletsController.cs
index acd22d758..33324c0be 100644
--- a/BTCPayServer/Controllers/UIWalletsController.cs
+++ b/BTCPayServer/Controllers/UIWalletsController.cs
@@ -578,7 +578,7 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> WalletSend(
             [ModelBinder(typeof(WalletIdModelBinder))]
             WalletId walletId, WalletSendModel vm, string command = "", CancellationToken cancellation = default,
-            string bip21 = "")
+            string? bip21 = "")
         {
             if (walletId?.StoreId == null)
                 return NotFound();