diff --git a/Mage.Server/plugins/mage-player-human.jar b/Mage.Server/plugins/mage-player-human.jar
index 1f7796c29b..e2583091cb 100644
Binary files a/Mage.Server/plugins/mage-player-human.jar and b/Mage.Server/plugins/mage-player-human.jar differ
diff --git a/Mage/src/mage/abilities/condition/common/HaveCounter.java b/Mage/src/mage/abilities/condition/common/HaveCounter.java
index eb304fd140..ccf6f11648 100644
--- a/Mage/src/mage/abilities/condition/common/HaveCounter.java
+++ b/Mage/src/mage/abilities/condition/common/HaveCounter.java
@@ -1,3 +1,30 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
 package mage.abilities.condition.common;
 
 import mage.abilities.Ability;
@@ -5,15 +32,25 @@ import mage.abilities.condition.Condition;
 import mage.counters.CounterType;
 import mage.game.Game;
 
+/**
+ * 
+ * @author nantuko
+ */
 public class HaveCounter implements Condition {
 	private CounterType counterType;
+	private int amount = 1;
 
 	public HaveCounter(CounterType type) {
 		this.counterType = type;
 	}
+	
+	public HaveCounter(CounterType type, int amount) {
+		this.counterType = type;
+		this.amount = amount;
+	}
 
 	@Override
 	public boolean apply(Game game, Ability source) {
-		return game.getPermanent(source.getSourceId()).getCounters().getCount(counterType) > 0;
+		return game.getPermanent(source.getSourceId()).getCounters().getCount(counterType) >= amount;
 	}
 }
diff --git a/Mage/src/mage/game/stack/Spell.java b/Mage/src/mage/game/stack/Spell.java
index e202a195ba..f4c68773c1 100644
--- a/Mage/src/mage/game/stack/Spell.java
+++ b/Mage/src/mage/game/stack/Spell.java
@@ -137,7 +137,12 @@ public class Spell<T extends Spell<T>> implements StackObject, Card {
 			newTarget.clearChosen();
 			for (UUID targetId: target.getTargets()) {
 				MageObject object = game.getObject(targetId);
-				if (player.chooseUse(ability.getEffects().get(0).getOutcome(), "Change target from " + object.getName() + "?", game)) {
+				String name = null;
+				if (object == null) {
+					Player targetPlayer = game.getPlayer(targetId);
+					if (player != null) name = targetPlayer.getName();
+				}
+				if (name != null && player.chooseUse(ability.getEffects().get(0).getOutcome(), "Change target from " + name + "?", game)) {
 					if (!player.chooseTarget(ability.getEffects().get(0).getOutcome(), newTarget, ability, game))
 						newTarget.addTarget(targetId, ability, game);
 				}