diff --git a/src/main/java/forge/card/ability/effects/ControlGainEffect.java b/src/main/java/forge/card/ability/effects/ControlGainEffect.java
index 03226f13043..8c67159cb94 100644
--- a/src/main/java/forge/card/ability/effects/ControlGainEffect.java
+++ b/src/main/java/forge/card/ability/effects/ControlGainEffect.java
@@ -23,7 +23,7 @@ public class ControlGainEffect extends SpellAbilityEffect {
         final StringBuilder sb = new StringBuilder();
 
         List<Player> newController = getTargetPlayers(sa, "NewController");
-        if (newController.size() == 0) {
+        if (newController.isEmpty()) {
             newController.add(sa.getActivatingPlayer());
         }
 
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index 2d4f03958c5..7242ce36b9e 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -2482,7 +2482,7 @@ public class Player extends GameEntity implements Comparable<Player> {
         } else if (property.startsWith("withMost")) {
             if (property.substring(8).equals("Life")) {
                 int highestLife = this.getLife(); // Negative base just in case a few Lich's are running around
-                Player healthiest = null;
+                Player healthiest = this;
                 for (final Player p : game.getPlayers()) {
                     if (p.getLife() > highestLife) {
                         highestLife = p.getLife();