From a0e824134751b6c665dcd3e33339c9158438eb75 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 15 Oct 2015 17:19:34 +0200
Subject: [PATCH] Minor change.

---
 Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
index 70113a4564a..963df6092bc 100644
--- a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
@@ -60,6 +60,7 @@ public class DiesAttachedTriggeredAbility extends TriggeredAbilityImpl {
                 // So check here with the LKI of the enchantment
                 Permanent attachment = game.getPermanentOrLKIBattlefield(getSourceId());
                 if (attachment != null
+                        && zEvent.getTargetId() != null && attachment.getAttachedTo() != null
                         && zEvent.getTargetId().equals(attachment.getAttachedTo())
                         && attachment.getAttachedToZoneChangeCounter() == zEvent.getTarget().getZoneChangeCounter(game) - 1) {
                     triggered = true;