diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java
index 1070bc068ed..a418cc1aa7a 100644
--- a/forge-core/src/main/java/forge/card/CardEdition.java
+++ b/forge-core/src/main/java/forge/card/CardEdition.java
@@ -342,6 +342,10 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
          */
         @Override
         public CardEdition get(final String code) {
+            if (code == null) {
+                return null;
+            }
+
             CardEdition baseResult = super.get(code);
             return baseResult == null ? aliasToEdition.get(code) : baseResult;
         }