diff --git a/res/cardsfolder/obsessive_search.txt b/res/cardsfolder/obsessive_search.txt
index b2693223381..08c44eb180d 100644
--- a/res/cardsfolder/obsessive_search.txt
+++ b/res/cardsfolder/obsessive_search.txt
@@ -2,8 +2,8 @@ Name:Obsessive Search
 ManaCost:U
 Types:Instant
 Text:no text
-K:spDrawCards:1:Draw a card.:Obsessive Search - draw a card.
+A:SP$Draw | Cost$ U | NumCards$ 1 | SpellDescription$ Draw a card.
 K:Madness:U
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obsessive_search.jpg
-End
+End
\ No newline at end of file
diff --git a/src/forge/SpellAbility_Requirements.java b/src/forge/SpellAbility_Requirements.java
index 554dcc59d96..75f305dcbdf 100644
--- a/src/forge/SpellAbility_Requirements.java
+++ b/src/forge/SpellAbility_Requirements.java
@@ -21,7 +21,8 @@ public class SpellAbility_Requirements {
 			if (!ability.getSourceCard().isCopiedSpell()){
 				Card c = ability.getSourceCard();
 				fromZone = AllZone.getZone(c);
-				fromZone.remove(c);
+				if (fromZone != null)
+					fromZone.remove(c);	
 			}
 		}