diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_086.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_086.java
index 6e919d634..655e6a514 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_086.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_086.java
@@ -45,8 +45,10 @@ public class Card3_086 extends AbstractMinion {
new ChooseActiveCardEffect(self, playerId, "Choose Blade Tip", Filters.name("Blade Tip"), Zone.SUPPORT, Filters.owner(playerId)) {
@Override
protected void cardSelected(LotroGame game, PhysicalCard card) {
- action.insertEffect(
- new TransferPermanentEffect(card, Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.ringBearer, Filters.not(Filters.hasAttached(Filters.name("Blade Tip"))))));
+ final PhysicalCard ringBearer = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.ringBearer, Filters.not(Filters.hasAttached(Filters.name("Blade Tip"))));
+ if (ringBearer != null)
+ action.insertEffect(
+ new TransferPermanentEffect(card, ringBearer));
}
});
return Collections.singletonList(action);
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 1fac83dd9..f4e3a9044 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
@@ -2,6 +2,8 @@
16 May 2012
- "Glamdring, Elven Blade" now lets the shadow player to choose a minion to exert.
- "Change of Plans" should now work correctly.
+- Game should no longer freeze if "Ulaire Otsea, Ringwraith in Twilight" is used to transfer "Blade Tip" to Ring-bearer
+who already has "Blade Tip" attached.
14 May 2012
- "City of Men" should now correctly discard a minion at the end of the skirmish.