diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 08320222163..317a9e62873 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -8869,6 +8869,8 @@ public class Card extends GameEntity implements Comparable<Card> {
     }
 
     public boolean canBeShownTo(final Player viewer) {
+        if (viewer == null) { return false; }
+
         Zone zone = this.getZone();
         if (zone == null) { return true; } //cards outside any zone are visible to all
 
diff --git a/forge-gui-desktop/src/main/java/forge/control/FControl.java b/forge-gui-desktop/src/main/java/forge/control/FControl.java
index 62a0f135d05..0ba9aac896f 100644
--- a/forge-gui-desktop/src/main/java/forge/control/FControl.java
+++ b/forge-gui-desktop/src/main/java/forge/control/FControl.java
@@ -370,7 +370,7 @@ public enum FControl implements KeyEventDispatcher {
     }
 
     public boolean mayShowCard(Card c) {
-        return game == null || !gameHasHumanPlayer || c.canBeShownTo(getCurrentPlayer());
+        return game == null || !gameHasHumanPlayer || ForgePreferences.DEV_MODE || c.canBeShownTo(getCurrentPlayer());
     }
 
     /**