From d1e95b07d4088a7c049dace5077f5c8b8b80a8cf Mon Sep 17 00:00:00 2001
From: barelyprofessional
 <150058423+barelyprofessional@users.noreply.github.com>
Date: Thu, 12 Feb 2026 09:07:16 -0600
Subject: [PATCH] Don't let exceptions go unhandled on chat messages as it's
 causing issues with the websocket library

---
 KfChatDotNetWsClient/ChatClient.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/KfChatDotNetWsClient/ChatClient.cs b/KfChatDotNetWsClient/ChatClient.cs
index 1aaa272..e3f78ea 100644
--- a/KfChatDotNetWsClient/ChatClient.cs
+++ b/KfChatDotNetWsClient/ChatClient.cs
@@ -308,7 +308,16 @@ public class ChatClient
         {
             _logger.Debug($"{JsonSerializer.Serialize(messages[0])}");
         }
-        OnMessages?.Invoke(this, messages, data);
+
+        try
+        {
+            OnMessages?.Invoke(this, messages, data);
+        }
+        catch (Exception e)
+        {
+            _logger.Error("Our handler for chat messages threw an exception");
+            _logger.Error(e);
+        }
     }
 
     private void WsChatUsersJoined(ResponseMessage message)