diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java
index 35bbd8c4871..2d654d2d495 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java
@@ -18,6 +18,7 @@
 package forge.screens.match.views;
 
 import java.util.List;
+import java.util.ArrayList;
 
 import javax.swing.JPanel;
 
@@ -176,10 +177,13 @@ public enum VLog implements IVDoc<CLog> {
     private List<GameLogEntry> getNewGameLogEntries(final GameView model) {
         String logEntryType = FModel.getPreferences().getPref(FPref.DEV_LOG_ENTRY_TYPE);
         GameLogEntryType logVerbosityFilter = GameLogEntryType.valueOf(logEntryType);
-        List<GameLogEntry> logEntries = model.getGameLog().getLogEntries(logVerbosityFilter);
-        // Set subtraction - remove all log entries from new list which are already displayed.
-        logEntries.removeAll(this.displayedLogEntries);
-        return logEntries;
+        if (model != null && model.getGameLog() != null) {
+            List<GameLogEntry> logEntries = model.getGameLog().getLogEntries(logVerbosityFilter);
+            // Set subtraction - remove all log entries from new list which are already displayed.
+            logEntries.removeAll(this.displayedLogEntries);
+            return logEntries;
+        }
+        return new ArrayList<GameLogEntry>();
     }
 
     private void addNewLogEntriesToJPanel(List<GameLogEntry> newLogEntries) {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java
index 7b96769d779..68716224b72 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java
@@ -118,6 +118,11 @@ public enum VStack implements IVDoc<CStack> {
 
     public void updateStack() {
         final GameView model = MatchUtil.getGameView();
+
+        if (model == null) {
+            return;
+        }
+
         final FCollectionView<StackItemView> items = model.getStack();
         tab.setText("Stack : " + items.size());
 
@@ -228,7 +233,7 @@ public enum VStack implements IVDoc<CStack> {
                 });
             }
 
-            final DetailColors color = CardDetailUtil.getBorderColor(item.getSourceCard().getCurrentState(), true);
+            final DetailColors color = CardDetailUtil.getBorderColor(item.getSourceCard().getCurrentState(), true);
             setBackground(new Color(color.r, color.g, color.b));
             setForeground(FSkin.getHighContrastColor(getBackground()));
         }