From dfb01d6099e1d0cddfcbe118e1e7cbb54db6df76 Mon Sep 17 00:00:00 2001
From: Ivan Bella <ivan@bella.name>
Date: Tue, 19 Dec 2023 20:48:37 +0000
Subject: [PATCH] Check for null

---
 .../java/datawave/webservice/query/util/LookupUUIDUtil.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java b/web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java
index e81cc751884..21630bc4cb2 100644
--- a/web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java
+++ b/web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java
@@ -433,7 +433,9 @@ private Query createSettings(MultivaluedMap<String,String> queryParameters) {
         Query query = responseObjectFactory.getQueryImpl();
         if (queryParameters != null) {
             MultivaluedMap<String,String> parms = new MultivaluedMapImpl<>();
-            parms.putAll(defaultOptionalParams);
+            if (defaultOptionalParams != null) {
+                parms.putAll(defaultOptionalParams);
+            }
             String params = queryParameters.getFirst(QueryParameters.QUERY_PARAMS);
             if (params != null) {
                 for (QueryImpl.Parameter pm : QueryUtil.parseParameters(params)) {