From 065a202c1dc9deb2012424d5e0e424f52e370a35 Mon Sep 17 00:00:00 2001
From: spjspj <spjspj4@gmail.com>
Date: Sun, 10 Apr 2016 13:00:44 +1000
Subject: [PATCH] Fix possible NPE for Martyr's Bond

---
 Mage.Sets/src/mage/sets/commander/MartyrsBond.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/commander/MartyrsBond.java b/Mage.Sets/src/mage/sets/commander/MartyrsBond.java
index 52a078cfe34..17670d48401 100644
--- a/Mage.Sets/src/mage/sets/commander/MartyrsBond.java
+++ b/Mage.Sets/src/mage/sets/commander/MartyrsBond.java
@@ -141,9 +141,9 @@ class MartyrsBondEffect extends OneShotEffect {
             Card sourceCard = game.getCard(source.getSourceId());
             Permanent saccedPermanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source));
             Player controller = game.getPlayer(source.getControllerId());
-            if (controller != null && sourceCard != null) {
+            if (controller != null && sourceCard != null && saccedPermanent != null) {
                 FilterControlledPermanent filter = new FilterControlledPermanent();
-                String message = "permanent with a type (";
+                String message = "permanent with type (";
                 boolean firstType = true;
 
                 ArrayList<CardTypePredicate> cardTypes = new ArrayList<>();
@@ -154,7 +154,7 @@ class MartyrsBondEffect extends OneShotEffect {
                         message += type;
                         firstType = false;
                     } else {
-                        message += ", " + type;
+                        message += " or " + type;
                     }
                 }
                 message += ") to sacrifice";
@@ -177,9 +177,9 @@ class MartyrsBondEffect extends OneShotEffect {
                     Permanent permanent = game.getPermanent(permID);
                     if (permanent != null) {
                         permanent.sacrifice(source.getSourceId(), game);
+                        return true;
                     }
                 }
-                return true;
             }
         }
         return false;