From 3a2ea56c92ae27f52ea480807d278829e05df09f Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sat, 1 May 2021 21:26:49 +0200
Subject: [PATCH] Fix NPE

---
 .../src/main/java/forge/screens/match/CMatchUI.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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());