From c81d9f6bc218a5abe2327ccb2d6b607b0bd5fac2 Mon Sep 17 00:00:00 2001
From: Adam Pantel <>
Date: Fri, 27 Dec 2019 07:28:21 -0500
Subject: [PATCH] Add null check for Volrath's Shapeshifter

---
 forge-game/src/main/java/forge/game/card/CardFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java
index f41e3542467..34aec26647b 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactory.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactory.java
@@ -875,7 +875,7 @@ public class CardFactory {
                 }
             }
 
-            if (sa.hasParam("GainTextOf")) {
+            if (sa.hasParam("GainTextOf") && originalState != null) {
                 state.setSetCode(originalState.getSetCode());
                 state.setRarity(originalState.getRarity());
                 state.setImageKey(originalState.getImageKey());