From 97e4e2738b497b51d8147cdc0f354ea3e6dfa836 Mon Sep 17 00:00:00 2001
From: Kevin Shin <kevinwshin@utexas.edu>
Date: Sat, 25 Aug 2018 03:36:32 -0500
Subject: [PATCH] Added check for if the exiled card's owner is missing.

---
 Mage.Sets/src/mage/cards/f/Flickerform.java | 60 +++++++++++----------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/f/Flickerform.java b/Mage.Sets/src/mage/cards/f/Flickerform.java
index b7aabe64753..0f0ef9da3e1 100644
--- a/Mage.Sets/src/mage/cards/f/Flickerform.java
+++ b/Mage.Sets/src/mage/cards/f/Flickerform.java
@@ -156,40 +156,44 @@ class FlickerformReturnEffect extends OneShotEffect {
         }
         ExileZone exileZone = game.getExile().getExileZone(exileZoneId);
         Card enchantedCard = exileZone.get(enchantedCardId, game);
-        Player owner = game.getPlayer(enchantedCard.getOwnerId());
+        //skip if exiled card is missing
         if (enchantedCard != null) {
-            owner.moveCards(enchantedCard, Zone.BATTLEFIELD, source, game);
-            Permanent newPermanent = game.getPermanent(enchantedCardId);
-            if (newPermanent != null) {
-                Set<Card> toBattlefieldAttached = new HashSet<Card>();
-                for (Card enchantment : exileZone.getCards(game)) {
-                    if (filterAura.match(enchantment, game)) {
-                        boolean canTarget = false;
-                        for (Target target : enchantment.getSpellAbility().getTargets()) {
-                            Filter filter = target.getFilter();
-                            if (filter.match(newPermanent, game)) {
-                                canTarget = true;
-                                break;
+            Player owner = game.getPlayer(enchantedCard.getOwnerId());
+            //skip if card's owner is missing
+            if (owner != null) {
+                owner.moveCards(enchantedCard, Zone.BATTLEFIELD, source, game);
+                Permanent newPermanent = game.getPermanent(enchantedCardId);
+                if (newPermanent != null) {
+                    Set<Card> toBattlefieldAttached = new HashSet<Card>();
+                    for (Card enchantment : exileZone.getCards(game)) {
+                        if (filterAura.match(enchantment, game)) {
+                            boolean canTarget = false;
+                            for (Target target : enchantment.getSpellAbility().getTargets()) {
+                                Filter filter = target.getFilter();
+                                if (filter.match(newPermanent, game)) {
+                                    canTarget = true;
+                                    break;
+                                }
+                            }
+                            if (!canTarget) {
+                                // Aura stays exiled
+                                continue;
+                            }
+                            game.getState().setValue("attachTo:" + enchantment.getId(), newPermanent);
+                        }
+                        toBattlefieldAttached.add(enchantment);
+                    }
+                    if (!toBattlefieldAttached.isEmpty()) {
+                        controller.moveCards(toBattlefieldAttached, Zone.BATTLEFIELD, source, game);
+                        for (Card card : toBattlefieldAttached) {
+                            if (game.getState().getZone(card.getId()) == Zone.BATTLEFIELD) {
+                                newPermanent.addAttachment(card.getId(), game);
                             }
                         }
-                        if (!canTarget) {
-                            // Aura stays exiled
-                            continue;
-                        }
-                        game.getState().setValue("attachTo:" + enchantment.getId(), newPermanent);
-                    }
-                    toBattlefieldAttached.add(enchantment);
-                }
-                if (!toBattlefieldAttached.isEmpty()) {
-                    controller.moveCards(toBattlefieldAttached, Zone.BATTLEFIELD, source, game);
-                    for (Card card : toBattlefieldAttached) {
-                        if (game.getState().getZone(card.getId()) == Zone.BATTLEFIELD) {
-                            newPermanent.addAttachment(card.getId(), game);
-                        }
                     }
                 }
+                return true;
             }
-            return true;
         }
         return false;
     }