diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIdPredicate.java index 1952990240d..7eeb8729bfd 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIdPredicate.java @@ -27,11 +27,12 @@ */ package mage.filter.predicate.permanent; -import java.util.UUID; import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author North @@ -46,6 +47,12 @@ public class ControllerIdPredicate implements Predicate { @Override public boolean apply(Permanent input, Game game) { + if(controllerId == null){ + return false; + } + if(input.getControllerId() == null){ + return false; + } return controllerId.equals(input.getControllerId()); }