From bca99199e41ca5c6bb3d1d1302c994738105302c Mon Sep 17 00:00:00 2001
From: Hellfish <hellfish@cardforge.org>
Date: Fri, 21 Oct 2011 08:49:44 +0000
Subject: [PATCH] *Fixed AF_NameCard crashing if the named card didn't exist or
 wasn't implemented. Now it will simply ask again. It is,sadly, still case
 sensitive.

---
 .../forge/card/abilityFactory/AbilityFactory_Choose.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java
index 1e1a74b2aea..c40531b558a 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java
@@ -1286,11 +1286,16 @@ public class AbilityFactory_Choose {
                 String name = null;
                 while (!ok) {
                     if (sa.getActivatingPlayer().isHuman()) {
-                        String message = validDesc.equals("card") ? "Name a card" : "Name a " + validDesc + " card";
+                        String message = validDesc.equals("card") ? "Name a card" : "Name a " + validDesc + " card. (Case sensitive)";
                         name = JOptionPane.showInputDialog(null, message, host.getName(), JOptionPane.QUESTION_MESSAGE);
                         if (!valid.equals("Card") && !(null == name)) {
+                            try {
                             Card temp = AllZone.getCardFactory().getCard(name, p);
                             ok = temp.isValid(valid, host.getController(), host);
+                            }
+                            catch(Exception ignored) {
+                                ok = false;
+                            }
                         }
                         else {
                             ok = true;