diff --git a/Mage.Sets/src/mage/cards/m/MassacreGirl.java b/Mage.Sets/src/mage/cards/m/MassacreGirl.java
index fa5de8db62ea..651ce1e540c5 100644
--- a/Mage.Sets/src/mage/cards/m/MassacreGirl.java
+++ b/Mage.Sets/src/mage/cards/m/MassacreGirl.java
@@ -12,6 +12,7 @@
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.ZoneChangeEvent;
@@ -94,7 +95,10 @@ public boolean checkEventType(GameEvent event, Game game) {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
-        return zEvent.isDiesEvent() && zEvent.getTarget().isCreature(game);
+        if (zEvent.isDiesEvent() && zEvent.getTarget() != null && StaticFilters.FILTER_PERMANENT_CREATURES.match(zEvent.getTarget(), controllerId, this, game)) {
+            return true;
+        }
+        return false;
     }
 
     @Override