From e89c12255bf6cc0d7d147f2f792224877238d3d2 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sun, 21 May 2023 15:16:49 +0800
Subject: [PATCH] fix NPE on CommanderGauntlet

---
 .../main/java/forge/gamemodes/gauntlet/GauntletUtil.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java
index 58ab25885e7..d133af275e0 100644
--- a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java
+++ b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java
@@ -120,12 +120,14 @@ public class GauntletUtil {
                     break;
                 case COMMANDER_DECK:
                     deck = DeckgenUtil.getCommanderDeck();
-                    eventNames.add(deck.getName());
+                    if (deck != null)
+                        eventNames.add(deck.getName());
                     break;
                 default:
                     continue;
             }
-            decks.add(deck);
+            if (deck != null)
+                decks.add(deck);
         }
 
         gauntlet.setDecks(decks);