From 0bd49604f80f936a7b4c5a1328b0a6c2a2fea007 Mon Sep 17 00:00:00 2001
From: nsalyzyn <nsalyzyn@gmail.com>
Date: Fri, 19 Dec 2025 12:42:06 -0700
Subject: [PATCH] Checking for empty data in renderChatMessageHTML calls

---
 daggerheart.mjs                    | 1 +
 module/applications/ui/chatLog.mjs | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/daggerheart.mjs b/daggerheart.mjs
index 644d6d86..d8bc3b8f 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -195,6 +195,7 @@ Hooks.once('dicesoniceready', () => {});
 
 Hooks.on('renderChatMessageHTML', (_, element, message) => {
     enricherRenderSetup(element);
+    if (!message) return;
     const cssClass = message.message.flags?.daggerheart?.cssClass;
     if (cssClass) cssClass.split(' ').forEach(cls => element.classList.add(cls));
 });
diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs
index 47dfe500..9b6a4126 100644
--- a/module/applications/ui/chatLog.mjs
+++ b/module/applications/ui/chatLog.mjs
@@ -56,6 +56,10 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
     }
 
     addChatListeners = async (app, html, data) => {
+        html.querySelectorAll('.group-roll-header-expand-section').forEach(element =>
+            element.addEventListener('click', this.groupRollExpandSection)
+        );
+        if (!data?.message) return;
         html.querySelectorAll('.simple-roll-button').forEach(element =>
             element.addEventListener('click', event => this.onRollSimple(event, data.message))
         );
@@ -77,9 +81,6 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
         html.querySelectorAll('.group-roll-success').forEach(element =>
             element.addEventListener('click', event => this.groupRollSuccessEvent(event, data.message))
         );
-        html.querySelectorAll('.group-roll-header-expand-section').forEach(element =>
-            element.addEventListener('click', this.groupRollExpandSection)
-        );
     };
 
     setupHooks() {