From 54c585afd8fa65a3e102d0f321d0d20ff976b8e6 Mon Sep 17 00:00:00 2001
From: igoudt <igoudt@bol.com>
Date: Sun, 31 Dec 2017 22:24:03 +0100
Subject: [PATCH] fixes #4317

---
 .../predicate/permanent/ControllerIdPredicate.java       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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<Permanent> {
 
     @Override
     public boolean apply(Permanent input, Game game) {
+        if(controllerId == null){
+            return false;
+        }
+        if(input.getControllerId() == null){
+            return false;
+        }
         return controllerId.equals(input.getControllerId());
     }