diff --git a/forge-gui/res/deckgendecks/Commander.dat b/forge-gui/res/deckgendecks/Commander.dat
index 8a7434b8b67..37a6f773476 100644
Binary files a/forge-gui/res/deckgendecks/Commander.dat and b/forge-gui/res/deckgendecks/Commander.dat differ
diff --git a/forge-gui/res/deckgendecks/Modern.dat b/forge-gui/res/deckgendecks/Modern.dat
index 13beb19934d..e382be58a9d 100644
Binary files a/forge-gui/res/deckgendecks/Modern.dat and b/forge-gui/res/deckgendecks/Modern.dat differ
diff --git a/forge-gui/res/deckgendecks/Standard.dat b/forge-gui/res/deckgendecks/Standard.dat
index b89787b14ca..1214ff1fcc9 100644
Binary files a/forge-gui/res/deckgendecks/Standard.dat and b/forge-gui/res/deckgendecks/Standard.dat differ
diff --git a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
index 6fb659b2099..e40c65f378c 100644
--- a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
+++ b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
@@ -506,8 +506,8 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
                         &&!card.getRules().getManaCost().isPureGeneric()
                         && colors.containsAllColorsFrom(card.getRules().getColorIdentity().getColor())
                         && !deckList.contains(card)
-                        && !keyCard.equals(card)
-                        && !secondKeyCard.equals(card)
+                        && (keyCard!=null && !keyCard.equals(card))
+                        && (secondKeyCard!=null && !secondKeyCard.equals(card))
                         &&!card.getRules().getAiHints().getRemAIDecks()
                         &&!card.getRules().getAiHints().getRemRandomDecks()
                         &&!card.getRules().getMainPart().getType().isLand();