diff --git a/src/main/java/forge/gui/match/controllers/CDetail.java b/src/main/java/forge/gui/match/controllers/CDetail.java
index b2e4fb25c58..f511de12397 100644
--- a/src/main/java/forge/gui/match/controllers/CDetail.java
+++ b/src/main/java/forge/gui/match/controllers/CDetail.java
@@ -74,6 +74,8 @@ public enum CDetail implements ICDoc {
         VDetail.SINGLETON_INSTANCE.getPnlDetail().addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(final MouseEvent e) {
+                if (VDetail.SINGLETON_INSTANCE.getPnlDetail().getCard() == null) { return; }
+
                 if (VDetail.SINGLETON_INSTANCE.getPnlDetail().getCard().isDoubleFaced()) {
                     CPicture.SINGLETON_INSTANCE.flipCard();
                 }
diff --git a/src/main/java/forge/gui/match/controllers/CPicture.java b/src/main/java/forge/gui/match/controllers/CPicture.java
index d573433e95f..dcfa6d8bd06 100644
--- a/src/main/java/forge/gui/match/controllers/CPicture.java
+++ b/src/main/java/forge/gui/match/controllers/CPicture.java
@@ -74,6 +74,8 @@ public enum CPicture implements ICDoc {
         VPicture.SINGLETON_INSTANCE.getPnlPicture().addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(final MouseEvent e) {
+                if (VPicture.SINGLETON_INSTANCE.getPnlPicture().getCard() == null) { return; }
+
                 if (VPicture.SINGLETON_INSTANCE.getPnlPicture().getCard().isDoubleFaced()) {
                     flipCard();
                 }
diff --git a/src/main/java/forge/gui/match/views/VDetail.java b/src/main/java/forge/gui/match/views/VDetail.java
index ea68e9a5d81..04f8f4e8119 100644
--- a/src/main/java/forge/gui/match/views/VDetail.java
+++ b/src/main/java/forge/gui/match/views/VDetail.java
@@ -47,6 +47,11 @@ public enum VDetail implements IVDoc {
     private final JLabel lblFlipcard = new JLabel(
             FSkin.getIcon(FSkin.InterfaceIcons.ICO_FLIPCARD));
 
+    //========= Constructor
+    private VDetail() {
+        lblFlipcard.setVisible(false);
+    }
+
     //========= Overridden methods
     /* (non-Javadoc)
      * @see forge.gui.framework.IVDoc#populate()