diff --git a/src/main/java/forge/card/abilityfactory/effects/DamagePreventEffect.java b/src/main/java/forge/card/abilityfactory/effects/DamagePreventEffect.java
index 28732db4a71..491daf21886 100644
--- a/src/main/java/forge/card/abilityfactory/effects/DamagePreventEffect.java
+++ b/src/main/java/forge/card/abilityfactory/effects/DamagePreventEffect.java
@@ -34,7 +34,7 @@ public class DamagePreventEffect extends SpellEffect {
                 } else {
                     sb.append(tgtC);
                 }
-            } else {
+            } else if (o instanceof Player){
                 sb.append(o.toString());
             }
         }
diff --git a/src/main/java/forge/gui/CardDetailPanel.java b/src/main/java/forge/gui/CardDetailPanel.java
index 523c3725cde..8d3d3c94cdc 100644
--- a/src/main/java/forge/gui/CardDetailPanel.java
+++ b/src/main/java/forge/gui/CardDetailPanel.java
@@ -319,12 +319,11 @@ public class CardDetailPanel extends JPanel implements CardContainer {
                 && !card.getController().getZone(ZoneType.Library).isEmpty()) {
             area.append("\r\nTop card of your library: ");
             area.append(card.getController().getCardsIn(ZoneType.Library, 1));
-        }
-        if (card.hasKeyword("Players play with the top card of their libraries revealed.")
-                && (card.getController() != null) && card.isInZone(ZoneType.Battlefield)
-                && !card.getController().getOpponent().getZone(ZoneType.Library).isEmpty()) {
-            area.append("\r\nTop card of your opponent's library: ");
-            area.append(card.getController().getOpponent().getCardsIn(ZoneType.Library, 1));
+            if (card.hasKeyword("Players play with the top card of their libraries revealed.")
+                    && !card.getController().getOpponent().getZone(ZoneType.Library).isEmpty()) {
+                area.append("\r\nTop card of your opponent's library: ");
+                area.append(card.getController().getOpponent().getCardsIn(ZoneType.Library, 1));
+            }
         }
 
         // chosen type