diff --git a/Mage/src/mage/cards/mock/MockCard.java b/Mage/src/mage/cards/mock/MockCard.java
index 64fa84b44d6..a066418ccf3 100644
--- a/Mage/src/mage/cards/mock/MockCard.java
+++ b/Mage/src/mage/cards/mock/MockCard.java
@@ -20,15 +20,8 @@ public class MockCard extends CardImpl<MockCard> {
         this.toughness = mageIntFromString(card.getToughness());
         this.rarity = card.getRarity();
         this.cardType = card.getTypes();
-        // dont copy list with empty element (would be better to eliminate earlier but I don't know how (LevelX2))
-        if (card.getSubTypes().get(0).length() >0) {
-            // empty element leads to added "-" after cardtype.
-            this.subtype = card.getSubTypes();
-        }
-        if (card.getSupertypes().get(0).length() >0) {
-            // empty element leads to blank before Card Type.
-            this.supertype = card.getSupertypes();
-        }
+        this.subtype = card.getSubTypes();
+        this.supertype = card.getSupertypes();
 
         this.usesVariousArt = card.usesVariousArt();
 
diff --git a/Mage/src/mage/cards/mock/MockSplitCard.java b/Mage/src/mage/cards/mock/MockSplitCard.java
index f7dd39537f0..fb7c5c32347 100644
--- a/Mage/src/mage/cards/mock/MockSplitCard.java
+++ b/Mage/src/mage/cards/mock/MockSplitCard.java
@@ -28,15 +28,8 @@ public class MockSplitCard extends SplitCard<MockSplitCard> {
         this.power = mageIntFromString(card.getPower());
         this.toughness = mageIntFromString(card.getToughness());
         this.cardType = card.getTypes();
-        // dont copy list with empty element (would be better to eliminate earlier but I don't know how (LevelX2))
-        if (card.getSubTypes().get(0).length() >0) {
-            // empty element leads to added "-" after cardtype.
-            this.subtype = card.getSubTypes();
-        }
-        if (card.getSupertypes().get(0).length() >0) {
-            // empty element leads to blank before Card Type.
-            this.supertype = card.getSupertypes();
-        }
+        this.subtype = card.getSubTypes();
+        this.supertype = card.getSupertypes();
 
         this.usesVariousArt = card.usesVariousArt();
 
diff --git a/Mage/src/mage/cards/repository/CardInfo.java b/Mage/src/mage/cards/repository/CardInfo.java
index afcac411a8e..7190e6d635c 100644
--- a/Mage/src/mage/cards/repository/CardInfo.java
+++ b/Mage/src/mage/cards/repository/CardInfo.java
@@ -185,6 +185,9 @@ public class CardInfo {
     }
 
     private List<String> parseList(String list) {
+        if (list.isEmpty()) {
+            return new ArrayList<String>();
+        }
         return Arrays.asList(list.split(SEPARATOR));
     }