diff --git a/forge-gui/src/main/java/forge/ImageCache.java b/forge-gui/src/main/java/forge/ImageCache.java
index c18903e18fb..40792615ebc 100644
--- a/forge-gui/src/main/java/forge/ImageCache.java
+++ b/forge-gui/src/main/java/forge/ImageCache.java
@@ -134,7 +134,10 @@ public class ImageCache {
      * </p>
      */
     public static BufferedImage getOriginalImage(String imageKey, boolean useDefaultIfNotFound) {
-
+        if (null == imageKey) { 
+            return null;
+        }
+        
         boolean altState = imageKey.endsWith(ImageKeys.BACKFACE_POSTFIX);
         if(altState)
             imageKey = imageKey.substring(0, imageKey.length() - ImageKeys.BACKFACE_POSTFIX.length());
diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java b/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java
index 22ee92332df..3578aea292a 100644
--- a/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java
+++ b/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java
@@ -45,6 +45,10 @@ public enum CDetail implements ICDoc {
      * @param c &emsp; Card object
      */
     public void showCard(final Card c) {
+        if (null == c) {
+            return;
+        }
+
         view.getLblFlipcard().setVisible(c != null && (c.isDoubleFaced() || c.isFlipCard() || c.isFaceDown() && Singletons.getControl().mayShowCard(c)));
         view.getPnlDetail().setCard(c);
         view.getParentCell().repaintSelf();