diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java
index fbd29adb35..a2ff6dd7b0 100644
--- a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java
+++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java
@@ -96,8 +96,11 @@ class CurseOfTheNightlyHuntEffect extends RequirementEffect<CurseOfTheNightlyHun
 
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
-        if (source.getControllerId().equals(permanent.getControllerId())) {
-            return true;
+        Permanent enchantment = game.getPermanent(source.getSourceId());
+        if (enchantment != null && enchantment.getAttachedTo() != null) {
+            if (source.getControllerId().equals(enchantment.getAttachedTo())) {
+                return true;
+            }
         }
         return false;
     }