diff --git a/Mage/src/main/java/mage/abilities/condition/common/ControlACommanderCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ControlACommanderCondition.java
index 4bbbf843d58..9cd23bbef9b 100644
--- a/Mage/src/main/java/mage/abilities/condition/common/ControlACommanderCondition.java
+++ b/Mage/src/main/java/mage/abilities/condition/common/ControlACommanderCondition.java
@@ -24,6 +24,7 @@ public enum ControlACommanderCondition implements Condition {
                 .map(player -> game.getCommandersIds(player, CommanderCardType.COMMANDER_OR_OATHBREAKER))
                 .flatMap(Collection::stream)
                 .map(game::getPermanent)
+                .filter(Objects::nonNull)
                 .map(Permanent::getControllerId)
                 .anyMatch(source.getControllerId()::equals);
     }