diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index 1af706a21a6..b748e8814d8 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -1591,6 +1591,10 @@ public class AbilityUtils {
 
                     if (root.isTrigger()) {
                         Trigger t = root.getTrigger();
+                        if (t == null) {
+                            return 0;
+                        }
+
                         // 107.3k If an object’s enters-the-battlefield triggered ability or replacement effect refers to X,
                         // and the spell that became that object as it resolved had a value of X chosen for any of its costs,
                         // the value of X for that ability is the same as the value of X for that spell, although the value of X for that permanent is 0.
diff --git a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
index 15f8869ec02..55532468591 100644
--- a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
+++ b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
@@ -473,13 +473,13 @@ public class WrappedAbility extends Ability {
 
         TriggerHandler th = game.getTriggerHandler();
 
+        // set Trigger
+        sa.setTrigger(regtrig);
+
         if (decider != null && !decider.getController().confirmTrigger(this, triggerParams, this.isMandatory())) {
             return;
         }
 
-        // set Trigger
-        sa.setTrigger(regtrig);
-
         if (!triggerParams.containsKey("NoTimestampCheck")) {
             timestampCheck();
         }
diff --git a/forge-gui/res/cardsfolder/upcoming/call_of_the_death_dweller.txt b/forge-gui/res/cardsfolder/upcoming/call_of_the_death_dweller.txt
new file mode 100755
index 00000000000..a4635e3117c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/call_of_the_death_dweller.txt
@@ -0,0 +1,8 @@
+Name:Call of the Death-Dweller
+ManaCost:2 B
+Types:Sorcery
+A:SP$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | TargetMin$ 0 | TargetMax$ 2 | MaxTotalTargetCMC$ 3 | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select up to two target creature cards with total converted mana cost 3 or less | SubAbility$ DBPutCounter | RememberChanged$ True | StackDescription$ SpellDescription | SpellDescription$ Return up to two target creature cards with total converted mana cost 3 or less from your graveyard to the battlefield. Put a deathtouch counter on either of them. Then put a menace counter on either of them.
+SVar:DBPutCounter:DB$ PutCounter | Choices$ Creature.IsRemembered | ChoiceTitle$ Choose a creature to put a deathtouch counter on | CounterType$ DEATHTOUCH | CounterNum$ 1 | SubAbility$ DBPutCounter2 | StackDescription$ None
+SVar:DBPutCounter2:DB$ PutCounter | Choices$ Creature.IsRemembered | ChoiceTitle$ Choose a creature to put a menace counter on | CounterType$ MENACE | CounterNum$ 1 | SubAbility$ DBCleanup | StackDescription$ None
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Return up to two target creature cards with total converted mana cost 3 or less from your graveyard to the battlefield. Put a deathtouch counter on either of them. Then put a menace counter on either of them.