diff --git a/Mage/src/main/java/mage/abilities/condition/common/AttachedToMatchesFilterCondition.java b/Mage/src/main/java/mage/abilities/condition/common/AttachedToMatchesFilterCondition.java
index eca3a8a38dd8..1a3f07a3e2a5 100644
--- a/Mage/src/main/java/mage/abilities/condition/common/AttachedToMatchesFilterCondition.java
+++ b/Mage/src/main/java/mage/abilities/condition/common/AttachedToMatchesFilterCondition.java
@@ -19,6 +19,9 @@ public class AttachedToMatchesFilterCondition implements Condition {
 
     public AttachedToMatchesFilterCondition(FilterPermanent filter) {
         this.filter = filter;
+        if (filter == null) {
+            throw new IllegalStateException("Wrong code usage. Filter must be non-nullable.");
+        }
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java
index 4747a19f6b5e..d01a7ada574d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java
@@ -47,7 +47,7 @@ public boolean apply(Game game, Ability source) {
         if (sourcePermanent == null) {
             sourcePermanent = game.getPermanentEntering(source.getSourceId());
         }
-        if (controller != null) {
+        if (controller != null && sourcePermanent != null) {
             Choice choice = new ChoiceImpl(true);
             choice.setMessage(choiceMessage);
             choice.getChoices().addAll(modes);