diff --git a/forge-game/src/main/java/forge/game/CardTraitBase.java b/forge-game/src/main/java/forge/game/CardTraitBase.java
index defab246258..426e9b32f73 100644
--- a/forge-game/src/main/java/forge/game/CardTraitBase.java
+++ b/forge-game/src/main/java/forge/game/CardTraitBase.java
@@ -263,7 +263,7 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView,
         final Game game = hostController.getGame();
 
         // intervening if check, make sure to use right controller
-        if (game.getStack().isResolving(getHostCard())) {
+        if (!game.getStack().isEmpty() && game.getStack().isResolving(getHostCard())) {
             SpellAbility sa = game.getStack().peek().getSpellAbility();
             if (sa.isTrigger()) {
                 hostController = sa.getActivatingPlayer();
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RegenerationEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RegenerationEffect.java
index c106bd53f56..eed76f8660c 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RegenerationEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RegenerationEffect.java
@@ -24,7 +24,7 @@ public class RegenerationEffect extends SpellAbilityEffect {
 
             c.setDamage(0);
             c.setHasBeenDealtDeathtouchDamage(false);
-            c.tap(true, cause, cause == null ? null : cause.getActivatingPlayer());
+            c.tap(true, cause, c.getController());
             c.addRegeneratedThisTurn();
 
             if (game.getCombat() != null) {