From e75e2324c7a7aad8e77d71476b2efd663a46deb3 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Sun, 23 Dec 2018 17:56:46 +0400
Subject: [PATCH] Fixed NPE errors for some cards

---
 Mage/src/main/java/mage/cards/CardsImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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<UUID> implements Cards, Serializabl
         List<String> 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<UUID> implements Cards, Serializabl
         Map<String, Card> 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();
     }