diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java index 99a590a8e1f..693554b4d43 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java @@ -192,7 +192,7 @@ public class ReplacementHandler implements IGameStateObject { } while(tailend != null); } - if (effectSA.isIntrinsic()) { + if (effectSA != null && effectSA.isIntrinsic()) { effectSA.setIntrinsic(true); effectSA.changeText(); }