diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
index 689e5a8db36..dafa114022a 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
@@ -919,7 +919,7 @@ public class HumanPlayer extends PlayerImpl {
     public void assignDamage(int damage, List<UUID> targets, String singleTargetName, UUID sourceId, Game game) {
         updateGameStatePriority("assignDamage", game);
         int remainingDamage = damage;
-        while (remainingDamage > 0) {
+        while (remainingDamage > 0 && isInGame()) {
             Target target = new TargetCreatureOrPlayer();
             if (singleTargetName != null) {
                 target.setTargetName(singleTargetName);
diff --git a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java
index 2019f7c8b6c..28968767c5f 100644
--- a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java
+++ b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java
@@ -113,7 +113,7 @@ class MasterOfTheWildHuntEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        List<UUID> wolves = new ArrayList<UUID>();
+        List<UUID> wolves = new ArrayList<>();
         Permanent target = game.getPermanent(source.getFirstTarget());
         if (target != null && game.getBattlefield().countAll(filter, source.getControllerId(), game) > 0) {
             for (Permanent permanent: game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) {