From 50c31f78d76c751ded41e935291a69ca2be38c4b Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Tue, 2 Dec 2014 17:55:25 +0100
Subject: [PATCH] * Energy Field - Fixed sometimes wrong detection of card
 going to own graveyard.

---
 Mage.Sets/src/mage/sets/urzassaga/EnergyField.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java b/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java
index b705b2c25a..f06ba302ab 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java
@@ -33,6 +33,7 @@ import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.PreventionEffectImpl;
 import mage.abilities.effects.common.SacrificeSourceEffect;
+import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Duration;
@@ -134,7 +135,8 @@ class PutIntoYourGraveyardTriggeredAbility extends TriggeredAbilityImpl {
         if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
             ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
             if (zEvent.getToZone() == Zone.GRAVEYARD) {
-                if (game.getControllerId(event.getTargetId()) == this.getControllerId()){
+                Card card = game.getCard(event.getTargetId());
+                if (card != null && card.getOwnerId().equals(getControllerId())) {
                     return true;
                 }
             }