diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VAllDecks.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VAllDecks.java
index a1d8bce2b30..6a6db784619 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VAllDecks.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VAllDecks.java
@@ -2,6 +2,7 @@ package forge.screens.deckeditor.views;
 
 import javax.swing.JPanel;
 
+import forge.deck.DeckProxy;
 import forge.deck.io.DeckPreferences;
 import forge.game.GameType;
 import forge.gui.framework.DragCell;
@@ -84,7 +85,9 @@ public enum VAllDecks implements IVDoc<CAllDecks> {
         parentBody.setLayout(new MigLayout("insets 5, gap 0, wrap, hidemode 3"));
         parentBody.add(new ItemManagerContainer(lstDecks), "push, grow");
         String preferredDeck = DeckPreferences.getCurrentDeck();
-        lstDecks.editDeck(lstDecks.stringToItem(preferredDeck));
+        DeckProxy deckProxy = lstDecks.stringToItem(preferredDeck);
+        if (deckProxy != null)
+            lstDecks.editDeck(deckProxy);
     }
 
     //========== Retrieval methods