Merge pull request #9427 from vespa-engine/ollivir/more-protobuf-null-checking

Another null check and a minimal test

1 files changed, 3 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
index 9404eb845bc..5ef4562f040 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
@@ -148,7 +148,9 @@ public class ProtobufSerialization {
         }
         MapConverter.convertMapStrings(featureMap, builder::addFeatureOverrides);
         MapConverter.convertMapTensors(featureMap, builder::addTensorFeatureOverrides);
-        MapConverter.convertStringMultiMap(query.getPresentation().getHighlight().getHighlightTerms(), builder::addHighlightTerms);
+        if (query.getPresentation().getHighlight() != null) {
+            MapConverter.convertStringMultiMap(query.getPresentation().getHighlight().getHighlightTerms(), builder::addHighlightTerms);
+        }
         mergeRankProperties(ranking, builder::addRankProperties, builder::addTensorRankProperties);
     }