From c401a7f5eaf25d0a8c0b356518d8f1ec7da34d9a Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 27 Jan 2018 18:29:47 +0100
Subject: [PATCH] Fixed some exception problems.

---
 Mage/src/main/java/mage/game/match/MatchImpl.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Mage/src/main/java/mage/game/match/MatchImpl.java b/Mage/src/main/java/mage/game/match/MatchImpl.java
index caccd3e463c..daad8c91a00 100644
--- a/Mage/src/main/java/mage/game/match/MatchImpl.java
+++ b/Mage/src/main/java/mage/game/match/MatchImpl.java
@@ -224,7 +224,7 @@ public abstract class MatchImpl implements Match {
         addGame(); // raises only the number
         shufflePlayers();
         for (MatchPlayer matchPlayer : this.players) {
-            if (!matchPlayer.hasQuit()) {
+            if (!matchPlayer.hasQuit() && matchPlayer.getDeck() != null) {
                 matchPlayer.getPlayer().init(game);
                 game.loadCards(matchPlayer.getDeck().getCards(), matchPlayer.getPlayer().getId());
                 game.loadCards(matchPlayer.getDeck().getSideboard(), matchPlayer.getPlayer().getId());
@@ -237,6 +237,10 @@ public abstract class MatchImpl implements Match {
                         matchPlayer.getPlayer().setPriorityTimeLeft(matchPlayer.getPriorityTimeLeft());
                     }
                 }
+            } else {
+                if (matchPlayer.getDeck() == null) {
+                    logger.error("Match: " + this.getId() + " " + matchPlayer.getName() + " has no deck.");
+                }
             }
         }
         game.setPriorityTime(options.getPriorityTime());