diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs
index ec55385..66216ca 100644
--- a/module/documents/roll.mjs
+++ b/module/documents/roll.mjs
@@ -127,6 +127,7 @@ export default class LethalFantasyRoll extends Roll {
    * @returns {Promise<Object|null>} The roll result or null if the dialog was cancelled.
    */
   static async prompt(options = {}) {
+    try {
     let dice = "1D20"
     let maxValue = 20
     let baseFormula = "1D20"
@@ -140,8 +141,6 @@ export default class LethalFantasyRoll extends Roll {
     let pointBlank = false
     let letItFly = false
     let saveSpell = game.lethalFantasy?.spellDefense ?? false
-    // Consume one-shot flag so it doesn't leak to subsequent non-spell saves
-    if (game.lethalFantasy) delete game.lethalFantasy.spellDefense
     let beyondSkill = false
     let hasStaticModifier = false
     let hasExplode = true
@@ -681,6 +680,10 @@ export default class LethalFantasyRoll extends Roll {
     if (Hooks.call("fvtt-lethal-fantasy.Roll", options, rollData, rollBase) === false) return
 
     return rollBase
+    } finally {
+      // Clear one-shot flag so it doesn't leak to subsequent non-spell saves
+      if (game.lethalFantasy) game.lethalFantasy.spellDefense = false
+    }
   }
 
   /* ***********************************************************/