diff --git a/Mage/src/main/java/mage/game/permanent/token/custom/CreatureToken.java b/Mage/src/main/java/mage/game/permanent/token/custom/CreatureToken.java
index 26a7c3bbb9b..0cbe256802a 100644
--- a/Mage/src/main/java/mage/game/permanent/token/custom/CreatureToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/custom/CreatureToken.java
@@ -31,9 +31,12 @@ public class CreatureToken  extends TokenImpl {
     public CreatureToken(int power, int toughness, String description, SubTypeList extraSubTypes) {
         super("", description);
         this.cardType.add(CardType.CREATURE);
-        this.subtype.addAll(extraSubTypes);
         this.power = new MageInt(power);
         this.toughness = new MageInt(toughness);
+
+        if (extraSubTypes != null) {
+            this.subtype.addAll(extraSubTypes);
+        }
     }
 
     public CreatureToken(final CreatureToken token) {