diff --git a/Mage/src/main/java/mage/cards/CardsImpl.java b/Mage/src/main/java/mage/cards/CardsImpl.java index 50492310d89..14c7537bf98 100644 --- a/Mage/src/main/java/mage/cards/CardsImpl.java +++ b/Mage/src/main/java/mage/cards/CardsImpl.java @@ -155,7 +155,9 @@ public class CardsImpl extends LinkedHashSet implements Cards, Serializabl List cards = new ArrayList<>(); for (UUID cardId : this) { Card card = game.getCard(cardId); - cards.add(card.getName()); + if (card != null) { + cards.add(card.getName()); + } } Collections.sort(cards); for (String name : cards) { @@ -183,7 +185,9 @@ public class CardsImpl extends LinkedHashSet implements Cards, Serializabl Map cards = new HashMap<>(); for (UUID cardId : this) { Card card = game.getCard(cardId); - cards.putIfAbsent(card.getName(), card); + if (card != null) { + cards.putIfAbsent(card.getName(), card); + } } return cards.values(); }