diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
index 4d2ced83cb9..2b2617697e7 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
@@ -1660,10 +1660,7 @@ public final class AbilityFactoryChangeZone {
             }
         }
 
-        if (tgt != null) {
-            tgt.resetTargets();
-        }
-
+        tgt.resetTargets();
         List<Card> list = CardLists.getValidCards(Singletons.getModel().getGame().getCardsIn(origin), tgt.getValidTgts(), ai, source);
         if (params.containsKey("AITgts")) {
             list = CardLists.getValidCards(list, params.get("AITgts"), sa.getActivatingPlayer(), source);
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index 97201cc968d..4f9b3d1f52d 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -1297,11 +1297,9 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
                 }
             }
 
-            if (game != null) {
-                this.setLastDrawnCard(c);
-                c.setDrawnThisTurn(true);
-                this.numDrawnThisTurn++;
-            }
+            this.setLastDrawnCard(c);
+            c.setDrawnThisTurn(true);
+            this.numDrawnThisTurn++;
 
             // Miracle draws
             if (this.numDrawnThisTurn == 1) {