Neither keys, nor values can be null.

1 files changed, 4 insertions, 4 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/result/Hit.java b/container-search/src/main/java/com/yahoo/search/result/Hit.java
index d0bc80b6950..77411167222 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Hit.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Hit.java
@@ -576,12 +576,12 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi
     /** Attach some data to this hit for this searcher */
     public void setSearcherSpecificMetaData(Searcher searcher, Object data) {
         if (searcherSpecificMetaData == null) {
-            searcherSpecificMetaData = Map.of(searcher, data);
+            if (data != null)
+                searcherSpecificMetaData = Map.of(searcher, data);
         } else {
             if (searcherSpecificMetaData.size() == 1) {
-                Object tmp = searcherSpecificMetaData.get(searcher);
-                if (tmp != null) {
-                    searcherSpecificMetaData = Map.of(searcher, data);
+                if (searcherSpecificMetaData.containsKey(searcher)) {
+                    searcherSpecificMetaData = (data != null) ? Map.of(searcher, data) : null;
                 } else {
                     searcherSpecificMetaData = new TreeMap<>(searcherSpecificMetaData);
                     searcherSpecificMetaData.put(searcher, data);