From d5003a6f8fe3a17cb8f6408a3f02263159d48072 Mon Sep 17 00:00:00 2001
From: Ingmar Goudt <ingmargoudt@gmail.com>
Date: Fri, 11 Jan 2019 01:04:34 +0100
Subject: [PATCH] add null check

---
 .../main/java/mage/abilities/effects/common/CipherEffect.java   | 2 +-
 Mage/src/main/java/mage/game/permanent/PermanentImpl.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java
index af625b9c7a2..72b22fc266e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java
@@ -115,7 +115,7 @@ class CipherStoreEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         Card cipherCard = game.getCard(cipherCardId);
-        if (cipherCard != null) {
+        if (cipherCard != null && controller != null) {
             Card copyCard = game.copyCard(cipherCard, source, controller.getId());
             SpellAbility ability = copyCard.getSpellAbility();
             // remove the cipher effect from the copy
diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
index ed908b5e146..a4d9290b227 100644
--- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
+++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
@@ -43,7 +43,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
 
     private static final Logger logger = Logger.getLogger(PermanentImpl.class);
 
-    public class MarkedDamageInfo {
+    static class MarkedDamageInfo {
 
         public MarkedDamageInfo(Counter counter, MageObject sourceObject) {
             this.counter = counter;