From 908861e56a94d35fba9ddba947aea38bf132f089 Mon Sep 17 00:00:00 2001
From: Achilles <jeff@delmarus.com>
Date: Sat, 25 Mar 2017 14:07:14 -0500
Subject: [PATCH] - Fixed Maralen of the Mornsong.

---
 Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java b/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java
index 391a11626d..d9e18642bf 100644
--- a/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java
+++ b/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java
@@ -129,12 +129,14 @@ class MaralenOfTheMornsongEffect2 extends OneShotEffect {
         Player player = game.getPlayer(activePlayerId);
         if (player != null) {
             player.loseLife(3, game, false);
-            TargetCardInLibrary target = new TargetCardInLibrary();
-            if (player.searchLibrary(target, game)) {
-                player.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game);
+            if (player != null) {
+                TargetCardInLibrary target = new TargetCardInLibrary();
+                if (player.searchLibrary(target, game)) {
+                    player.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game);
+                }
+                player.shuffleLibrary(source, game);
+                return true;
             }
-            player.shuffleLibrary(source, game);
-            return true;
         }
         return false;
     }