diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index e83bd1e1938..a25e3ead2ab 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -923,8 +923,12 @@ public class CardFactory implements NewConstants {
 		                			{
 		                				CardList dChoices = new CardList();
 			                				                			
-			                			if (DiscardMethod.contains("Creature") && !DiscardMethod.contains("nonCreature"))
-			                				dChoices.add(CardFactoryUtil.AI_getBestCreature(dPChHand));
+			                			if (DiscardMethod.contains("Creature") && !DiscardMethod.contains("nonCreature")) {
+			                				Card c = CardFactoryUtil.AI_getBestCreature(dPChHand);
+			                				if (c!=null)
+			                					dChoices.add(CardFactoryUtil.AI_getBestCreature(dPChHand));
+			                			}
+			                				
 			                			
 		                				CardListUtil.sortByTextLen(dPChHand);
 		                				dChoices.add(dPChHand.get(0));