From 473a65f9bad80913aa4373ac909957b36bea53cc Mon Sep 17 00:00:00 2001
From: Chris H <zenchristo@gmail.com>
Date: Fri, 1 Nov 2024 12:39:25 -0400
Subject: [PATCH] Fix crash when a player dies with a card on the stack

---
 forge-game/src/main/java/forge/game/Game.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java
index 0ed7bf86576..41be0638d13 100644
--- a/forge-game/src/main/java/forge/game/Game.java
+++ b/forge-game/src/main/java/forge/game/Game.java
@@ -902,7 +902,9 @@ public class Game {
                     // return stolen spells
                     if (c.isInZone(ZoneType.Stack)) {
                         SpellAbilityStackInstance si = getStack().getInstanceMatchingSpellAbilityID(c.getCastSA());
-                        si.setActivatingPlayer(c.getController());
+                        if (si != null) {
+                            si.setActivatingPlayer(c.getController());
+                        }
                     }
                     if (c.getController().equals(p) && !(c.isPlane() || c.isPhenomenon())) {
                         getAction().exile(c, null, null);