diff --git a/forge-game/src/main/java/forge/trackable/TrackableTypes.java b/forge-game/src/main/java/forge/trackable/TrackableTypes.java
index 8f37e6db7a6..ce7370c0236 100644
--- a/forge-game/src/main/java/forge/trackable/TrackableTypes.java
+++ b/forge-game/src/main/java/forge/trackable/TrackableTypes.java
@@ -57,6 +57,7 @@ public class TrackableTypes {
 
         @Override
         protected void updateObjLookup(Tracker tracker, T newObj) {
+            if (tracker == null) { return; }
             HashMap<Integer, T> objLookup = getObjLookup(tracker);
             if (newObj != null && !objLookup.containsKey(newObj.getId())) {
                 objLookup.put(newObj.getId(), newObj);