diff --git a/mutiny-core/src/lib.rs b/mutiny-core/src/lib.rs
index bc69d81e7..d43b752b9 100644
--- a/mutiny-core/src/lib.rs
+++ b/mutiny-core/src/lib.rs
@@ -893,10 +893,12 @@ impl<S: MutinyStorage> MutinyWallet<S> {
         let invoice = if self.safe_mode {
             None
         } else {
-            self.create_lightning_invoice(amount, labels.clone())
-                .await
-                .ok()
-                .and_then(|invoice| invoice.bolt11)
+            Some(
+                self.create_lightning_invoice(amount, labels.clone())
+                    .await?
+                    .bolt11
+                    .ok_or(MutinyError::InvoiceCreationFailed)?,
+            )
         };
 
         let Ok(address) = self.node_manager.get_new_address(labels.clone()) else {