From 3721f9ee3f31f89a637d39d1f3f58840ade4ffff Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Wed, 13 Aug 2025 18:45:52 +0200
Subject: [PATCH] Fixed so missing statuses doesn't cause crashes

---
 module/canvas/placeables/token.mjs | 14 ++++++++------
 module/documents/activeEffect.mjs  |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/module/canvas/placeables/token.mjs b/module/canvas/placeables/token.mjs
index f2096c9a..09b3b192 100644
--- a/module/canvas/placeables/token.mjs
+++ b/module/canvas/placeables/token.mjs
@@ -20,12 +20,14 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
             for (var status of effect.statuses) {
                 if (!currentStatusActiveEffects.find(x => x.statuses.has(status))) {
                     const statusData = statusMap.get(status);
-                    acc.push({
-                        name: game.i18n.localize(statusData.name),
-                        statuses: [status],
-                        img: statusData.icon,
-                        tint: effect.tint
-                    });
+                    if (statusData) {
+                        acc.push({
+                            name: game.i18n.localize(statusData.name),
+                            statuses: [status],
+                            img: statusData.icon,
+                            tint: effect.tint
+                        });
+                    }
                 }
             }
 
diff --git a/module/documents/activeEffect.mjs b/module/documents/activeEffect.mjs
index bf535b78..f46cc9db 100644
--- a/module/documents/activeEffect.mjs
+++ b/module/documents/activeEffect.mjs
@@ -118,7 +118,7 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
 
         for (const statusId of this.statuses) {
             const status = CONFIG.statusEffects.find(s => s.id === statusId);
-            tags.push(game.i18n.localize(status.name));
+            if (status) tags.push(game.i18n.localize(status.name));
         }
 
         return tags;