diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java
index f0bead576bd..0b48a791d12 100644
--- a/forge-core/src/main/java/forge/card/CardDb.java
+++ b/forge-core/src/main/java/forge/card/CardDb.java
@@ -576,7 +576,13 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
         return Lists.newArrayList(Iterables.filter(this.roAllCards, new Predicate<PaperCard>() {
             @Override
             public boolean apply(final PaperCard paperCard) {
-                return editions.getEditionByCodeOrThrow(paperCard.getEdition()).getType() != Type.PROMOS;
+                CardEdition edition = null;
+                try {
+                    edition = editions.getEditionByCodeOrThrow(paperCard.getEdition());
+                } catch (Exception ex) {
+                    return false;
+                }
+                return edition != null && edition.getType() != Type.PROMOS;
             }
         }));
     }