diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java
index 72a2d263376..db27bb77b53 100644
--- a/forge-core/src/main/java/forge/card/CardDb.java
+++ b/forge-core/src/main/java/forge/card/CardDb.java
@@ -635,10 +635,12 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
                 CardEdition edition = null;
                 try {
                     edition = editions.getEditionByCodeOrThrow(paperCard.getEdition());
+                    if (edition.getType() == Type.PROMOS||edition.getType() == Type.REPRINT)
+                        return false;
                 } catch (Exception ex) {
                     return false;
                 }
-                return edition != null && (edition.getType() != Type.PROMOS||edition.getType() != Type.REPRINT);
+                return true;
             }
         }));
     }