From 0a40ff50eef20a820fe6b9cb372cd49ce2abe471 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Tue, 4 Aug 2015 01:17:28 +0000
Subject: [PATCH] Avoid introducing an invalid creature type

---
 .../java/forge/game/ability/effects/ChooseTypeEffect.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java
index 15ccbcf3a69..1f5a14aafc8 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java
@@ -109,8 +109,9 @@ public class ChooseTypeEffect extends SpellAbilityEffect {
         //loop through sorted list and move each type to the front of the validTypes collection
         for (Entry<String, Integer> entry : sortedList) {
             String type = entry.getKey();
-            validTypes.remove(type);
-            validTypes.add(0, type);
+            if (validTypes.remove(type)) { //ensure an invalid type isn't introduced
+                validTypes.add(0, type);
+            }
         }
     }
 }