From 68033fd64befd6a92410d0998c2b674ba40fcfae Mon Sep 17 00:00:00 2001
From: Matthew Bellew <matthewb@labkey.com>
Date: Tue, 31 Aug 2021 10:59:55 -0700
Subject: [PATCH] Null check in DOM attribute

---
 api/src/org/labkey/api/util/DOM.java                   | 2 +-
 api/src/org/labkey/api/util/DisplayElementBuilder.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/src/org/labkey/api/util/DOM.java b/api/src/org/labkey/api/util/DOM.java
index a5cc267da04..641d22e8414 100644
--- a/api/src/org/labkey/api/util/DOM.java
+++ b/api/src/org/labkey/api/util/DOM.java
@@ -970,7 +970,7 @@ else if (key instanceof String)
                     }
                     else
                     {
-                        throw new IllegalArgumentException(String.valueOf(key));
+                        throw new IllegalArgumentException("Bad attribute in '" + tagName + "' element: " + String.valueOf(key));
                     }
                 }
                 // TODO again horrible hack, make this go away
diff --git a/api/src/org/labkey/api/util/DisplayElementBuilder.java b/api/src/org/labkey/api/util/DisplayElementBuilder.java
index e8e1a72a9ed..cdd3e47d9a2 100644
--- a/api/src/org/labkey/api/util/DisplayElementBuilder.java
+++ b/api/src/org/labkey/api/util/DisplayElementBuilder.java
@@ -85,6 +85,8 @@ public BUILDER onClick(String onClick)
 
     public BUILDER attributes(Map<String, String> attributes)
     {
+        if (attributes != null && attributes.containsKey(null))
+            throw new NullPointerException("Unexpected key value in attributes");
         if (attributes != null && !attributes.isEmpty())
             this.attributes = new TreeMap<>(attributes);
         else