From 65c4ed7e5b9b3ed64e7b0b7ee308ace01de2c852 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Mon, 31 May 2021 15:19:10 -0400
Subject: [PATCH] [RAV] fixed an error with Bottled Cloiser (fixes #7849)

---
 Mage.Sets/src/mage/cards/b/BottledCloister.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/b/BottledCloister.java b/Mage.Sets/src/mage/cards/b/BottledCloister.java
index c031230a58d..d64cea6e22f 100644
--- a/Mage.Sets/src/mage/cards/b/BottledCloister.java
+++ b/Mage.Sets/src/mage/cards/b/BottledCloister.java
@@ -12,7 +12,6 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.TargetController;
 import mage.constants.Zone;
-import mage.game.ExileZone;
 import mage.game.Game;
 import mage.players.Player;
 import mage.util.CardUtil;
@@ -103,12 +102,12 @@ class BottledCloisterReturnEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());
-        ExileZone exileZone = game.getExile().getExileZone(CardUtil.getExileZoneId(game, source));
-        Cards cards = new CardsImpl(exileZone);
-        cards.removeIf(uuid -> !player.getId().equals(game.getOwnerId(uuid)));
-        if (!cards.isEmpty()) {
-            player.moveCards(cards, Zone.HAND, source, game);
+        if (player == null) {
+            return false;
         }
+        Cards cards = new CardsImpl(game.getExile().getExileZone(CardUtil.getExileZoneId(game, source)).getCards(game));
+        cards.removeIf(uuid -> !player.getId().equals(game.getOwnerId(uuid)));
+        player.moveCards(cards, Zone.HAND, source, game);
         player.drawCards(1, source, game);
         return true;
     }