From 40b05f7ad4b04e4c513939a1aedfdc7ea188773c Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Mon, 30 Jan 2017 09:11:29 +0000
Subject: [PATCH] - NPE prevention in SpellAbilityRestriction (prevents Jhoira
 of the Ghitu Avatar crashing)

---
 .../java/forge/game/spellability/SpellAbilityRestriction.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
index 383412fb29c..06f19c00cf3 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
@@ -227,7 +227,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
             if (sa.isSpell()) {
                 final CardPlayOption o = c.mayPlay(sa.getMayPlay());
                 if (o == null) {
-                    return this.getZone() == null || cardZone.is(this.getZone());
+                    return this.getZone() == null || (cardZone != null && cardZone.is(this.getZone()));
                 } else if (o.getPlayer() == activator) {
                     Map<String,String> params = sa.getMayPlay().getMapParams();