From d0c29ede56b9834c4a71ac58656524b1996b724f Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Mon, 1 Jun 2026 12:24:00 +0200
Subject: [PATCH] Fixed so the combat tracker doesn't error out if a combatant
 has no attached token (#1960)

---
 module/applications/ui/combatTracker.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/applications/ui/combatTracker.mjs b/module/applications/ui/combatTracker.mjs
index 0989bcb8..8dd76850 100644
--- a/module/applications/ui/combatTracker.mjs
+++ b/module/applications/ui/combatTracker.mjs
@@ -133,7 +133,7 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
             canPing: combatant.sceneId === canvas.scene?.id && game.user.hasPermission('PING_CANVAS'),
             type: combatant.actor?.system?.type,
             img: await this._getCombatantThumbnail(combatant),
-            disposition: combatant.token.disposition
+            disposition: combatant.token?.disposition
         };
 
         turn.css = [turn.active ? 'active' : null, hidden ? 'hide' : null, isDefeated ? 'defeated' : null].filterJoin(