From b969f2eac69b2780dae072778e6ac3b36010a081 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Wed, 27 Sep 2017 17:02:23 +0000
Subject: [PATCH] - Fixed a NPE in DiscardEffect.

---
 .../java/forge/game/ability/effects/DiscardEffect.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
index 9346f58e0ce..afb31549932 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
@@ -293,11 +293,11 @@ public class DiscardEffect extends SpellAbilityEffect {
 
                     CardCollectionView toBeDiscarded = validCards.isEmpty() ? null : chooser.getController().chooseCardsToDiscardFrom(p, sa, validCards, min, max);
 
-                    if (toBeDiscarded.size() > 1) {
-                        toBeDiscarded = GameActionUtil.orderCardsByTheirOwners(p.getGame(), toBeDiscarded, ZoneType.Graveyard);
-                    }
-
                     if (toBeDiscarded != null) {
+                        if (toBeDiscarded.size() > 1) {
+                            toBeDiscarded = GameActionUtil.orderCardsByTheirOwners(p.getGame(), toBeDiscarded, ZoneType.Graveyard);
+                        }
+
                         if (mode.startsWith("Reveal") ) {
                             p.getController().reveal(toBeDiscarded, ZoneType.Hand, p,
                                     chooser + " has chosen " + (toBeDiscarded.size() == 1 ? "this card" : "these cards")  + " from ");