From 57d059ff58e876aaa35ec45b9c7755baec448d40 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Tue, 25 Sep 2012 16:01:18 +0000
Subject: [PATCH] - "Rallying Call" should no longer cause the game to crash,
 if an FP character dies and there were threats.

---
 .../main/java/com/gempukku/lotro/logic/effects/KillEffect.java  | 2 +-
 .../com/gempukku/lotro/logic/effects/RemoveThreatsEffect.java   | 2 +-
 gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java
index b07a87c75..0d012510d 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java
@@ -43,7 +43,7 @@ public class KillEffect extends AbstractSuccessfulEffect {
     public List<PhysicalCard> getCharactersToBeKilled() {
         List<PhysicalCard> result = new LinkedList<PhysicalCard>();
         for (PhysicalCard card : _cards) {
-            if (card.getZone().isInPlay())
+            if (card.getZone() != null && card.getZone().isInPlay())
                 result.add(card);
         }
 
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/RemoveThreatsEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/RemoveThreatsEffect.java
index b12d466b6..335b512dc 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/RemoveThreatsEffect.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/RemoveThreatsEffect.java
@@ -31,7 +31,7 @@ public class RemoveThreatsEffect extends AbstractEffect {
 
     @Override
     protected FullEffectResult playEffectReturningResult(LotroGame game) {
-        if (game.getModifiersQuerying().canRemoveThreat(game.getGameState(), _source)) {
+        if (_source == null || game.getModifiersQuerying().canRemoveThreat(game.getGameState(), _source)) {
             int toRemove = Math.min(game.getGameState().getThreats(), _count);
 
             if (toRemove > 0) {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index 2419a3d90..dd12f64a0 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -3,6 +3,7 @@
 - "Elven Armaments" now prevents only the FP player from using the Archery special abilities.
 - "Whatever Means" should now work correctly in cases, when burdens cannot be removed.
 - "Sword of Minas Morgul" should now correctly discard the possession from character in the skirmish.
+- "Rallying Call" should no longer cause the game to crash, if an FP character dies and there were threats.
 
 <b>20 Sep. 2012</b>
 - "Rallying Call" should now correctly prevent removal of threats by FP cards.