diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
index 6af24207671..2e9e256baa1 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
@@ -270,7 +270,7 @@ public final class CMatchUI
      * View deck list.
      */
     public void viewDeckList() {
-        if (!isInGame()) {
+        if (!isInGame() || getCurrentPlayer() == null) {
             return;
         }
         final Deck deck = getGameView().getDeck(getCurrentPlayer());