Tolerate non-existing summary classes

2 files changed, 3 insertions, 4 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
index d658f565a10..9b185a27aed 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
@@ -258,8 +258,8 @@ public class Dispatcher extends AbstractComponent {
             }
 
             Inspector summaries = new SlimeAdapter(root.field("docsums"));
-            if ( ! summaries.valid() && ! hasErrors)
-                throw new IllegalArgumentException("Expected a Slime root object containing a 'docsums' field");
+            if ( ! summaries.valid())
+                return 0; // Requested a non-existing summary class: Nothing to fill
             int skippedHits = 0;
             for (int i = 0; i < hits.size(); i++) {
                 Inspector summary = summaries.entry(i).field("docsum");
diff --git a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
index 4f4dff6f395..cb3a9abffc4 100644
--- a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
+++ b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
@@ -583,8 +583,7 @@ public class HitGroup extends Hit implements DataList<Hit>, Cloneable, Iterable<
             Collections.sort(hits);
             hitsSorted = true;
         } else {
-            // This may or may not lead to a sorted result set, but
-            // it's a best effort
+            // This may or may not lead to a sorted result set, but it's a best effort
             hitOrderer.order(hits);
             if (likelyHitsHaveCorrectValueForSortFields()) {
                 hitsSorted = true;