From 1b3c9868a2f88aa034c4334d26866fb757c275f7 Mon Sep 17 00:00:00 2001
From: MichaelWest22 <michael@latent.nz>
Date: Sun, 27 Jul 2025 15:12:58 +1200
Subject: [PATCH] add back null check for no form in getRelatedFormData

---
 src/htmx.js              |  3 +++
 test/core/regressions.js | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/htmx.js b/src/htmx.js
index aa9908f9b..9a250abef 100644
--- a/src/htmx.js
+++ b/src/htmx.js
@@ -2864,6 +2864,9 @@ var htmx = (function() {
       return
     }
     const form = getRelatedForm(elt)
+    if (!form) {
+      return
+    }
     return getInternalData(form)
   }
 
diff --git a/test/core/regressions.js b/test/core/regressions.js
index 750626224..336a66d56 100644
--- a/test/core/regressions.js
+++ b/test/core/regressions.js
@@ -384,4 +384,15 @@ describe('Core htmx Regression Tests', function() {
 
     span.click()
   })
+
+  it('check deleting button during click does not trigger exception error in getRelatedFormData when button can no longer find form', function() {
+    var defaultPrevented = 'unset'
+    var form = make('<form><button>delete</button></form>')
+    var button = form.firstChild
+    htmx.on(button, 'click', function(evt) {
+      evt.target.remove()
+    })
+
+    button.click()
+  })
 })