From c100b90c707c0992b05ec0b3d26a96961375b217 Mon Sep 17 00:00:00 2001
From: elcnesh <elcnesh@cardforge.org>
Date: Thu, 2 Apr 2015 08:43:58 +0000
Subject: [PATCH] - Add Deck copy constructor - Throw exception when
 deserialising non-existing PaperCard

---
 forge-core/src/main/java/forge/deck/Deck.java      | 13 +++++++++++++
 forge-core/src/main/java/forge/item/PaperCard.java |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java
index 5fd32173dae..9a0f7526920 100644
--- a/forge-core/src/main/java/forge/deck/Deck.java
+++ b/forge-core/src/main/java/forge/deck/Deck.java
@@ -62,6 +62,19 @@ public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPo
         getOrCreate(DeckSection.Main);
     }
 
+    /**
+     * Copy constructor.
+     * 
+     * @param other
+     *            the {@link Deck} to copy.
+     */
+    public Deck(final Deck other) {
+        super(other.getName());
+        setComment(other.getComment());
+        parts.putAll(other.parts);
+        tags.addAll(other.getTags());
+    }
+
     @Override
     public String getItemType() {
         return "Deck";
diff --git a/forge-core/src/main/java/forge/item/PaperCard.java b/forge-core/src/main/java/forge/item/PaperCard.java
index 8c6b603d1db..0bed320ca29 100644
--- a/forge-core/src/main/java/forge/item/PaperCard.java
+++ b/forge-core/src/main/java/forge/item/PaperCard.java
@@ -211,6 +211,9 @@ public final class PaperCard implements Comparable<IPaperCard>, InventoryItemFro
         ois.defaultReadObject();
 
         final IPaperCard pc = StaticData.instance().getCommonCards().getCard(name, edition, artIndex);
+        if (pc == null) {
+            throw new IOException(String.format("Card %s not found", name));
+        }
         this.rules = pc.getRules();
         this.rarity = pc.getRarity();
     }