diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
index 1fce268cfc..6c44d64fe5 100644
--- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
+++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
@@ -988,11 +988,11 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
     public void castSpell(int turnNum, PhaseStep step, TestPlayer player, String cardName, String targetName, String spellOnStack, StackClause clause) {
         if (StackClause.WHILE_ON_STACK.equals(clause)) {
             player.addAction(turnNum, step, "activate:Cast " + cardName
-                    + "$" + (targetName.startsWith("target") ? targetName : "target=" + targetName)
+                    + "$" + (targetName != null && targetName.startsWith("target") ? targetName : "target=" + targetName)
                     + "$spellOnStack=" + spellOnStack);
         } else {
             player.addAction(turnNum, step, "activate:Cast " + cardName
-                    + "$" + (targetName.startsWith("target") ? targetName : "target=" + targetName)
+                    + "$" + (targetName != null && targetName.startsWith("target") ? targetName : "target=" + targetName)
                     + "$!spellOnStack=" + spellOnStack);
         }
     }