diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
index b282151b7f8..95e5e4dcec1 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
@@ -121,7 +121,8 @@ public class CountersPutAi extends SpellAbilityAi {
                         for (Trigger t : aiCreature.getTriggers()) {
                             if (t.getMode() == TriggerType.SpellCast) {
                                 final Map<String, String> params = t.getMapParams();
-                                if ("Card.Self".equals(params.get("TargetsValid")) && "You".equals(params.get("ValidActivatingPlayer"))) {
+                                if ("Card.Self".equals(params.get("TargetsValid")) && "You".equals(params.get("ValidActivatingPlayer")) 
+                                		&& params.containsKey("Execute")) {
                                     SpellAbility heroic = AbilityFactory.getAbility(aiCreature.getSVar(params.get("Execute")),aiCreature);
                                     if ("Self".equals(heroic.getParam("Defined")) && "P1P1".equals(heroic.getParam("CounterType"))) {
                                         int n = AbilityUtils.calculateAmount(aiCreature, heroic.getParam("CounterNum"), heroic);
diff --git a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java b/forge-ai/src/main/java/forge/ai/ability/EffectAi.java
index 1ef3e3a263b..cf5d23e64e8 100644
--- a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/EffectAi.java
@@ -149,7 +149,8 @@ public class EffectAi extends SpellAbilityAi {
                             for (Trigger t : aiCreature.getTriggers()) {
                                 if (t.getMode() == TriggerType.SpellCast) {
                                     final Map<String, String> params = t.getMapParams();
-                                    if ("Card.Self".equals(params.get("TargetsValid")) && "You".equals(params.get("ValidActivatingPlayer"))) {
+                                    if ("Card.Self".equals(params.get("TargetsValid")) && "You".equals(params.get("ValidActivatingPlayer")) 
+                                    		&& params.containsKey("Execute")) {
                                         SpellAbility heroic = AbilityFactory.getAbility(aiCreature.getSVar(params.get("Execute")),aiCreature);
                                         if ("Self".equals(heroic.getParam("Defined")) && "P1P1".equals(heroic.getParam("CounterType"))) {
                                             int amount = AbilityUtils.calculateAmount(aiCreature, heroic.getParam("CounterNum"), heroic);
diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java
index 0e5727d78bd..a82624a01ec 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java
@@ -246,7 +246,8 @@ public class PumpAi extends PumpAiBase {
                             for (Trigger t : aiCreature.getTriggers()) {
                                 if (t.getMode() == TriggerType.SpellCast) {
                                     final Map<String, String> params = t.getMapParams();
-                                    if ("Card.Self".equals(params.get("TargetsValid")) && "You".equals(params.get("ValidActivatingPlayer"))) {
+                                    if ("Card.Self".equals(params.get("TargetsValid")) && "You".equals(params.get("ValidActivatingPlayer")) 
+                                    		&& params.containsKey("Execute")) {
                                         SpellAbility heroic = AbilityFactory.getAbility(aiCreature.getSVar(params.get("Execute")),aiCreature);
                                         if ("Self".equals(heroic.getParam("Defined")) && "P1P1".equals(heroic.getParam("CounterType"))) {
                                             int amount = AbilityUtils.calculateAmount(aiCreature, heroic.getParam("CounterNum"), heroic);