1 files changed, 4 insertions, 3 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java b/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java
index 0116d668d48..2d4ac86e3b2 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java
@@ -75,14 +75,15 @@ public class MinimalQueryInserter extends Searcher {
 
     @Override
     public Result search(Query query, Execution execution) {
+        if (query.properties().get(YQL) == null) return execution.search(query);
+        Result errorResult;
         try {
-            if (query.properties().get(YQL) == null) return execution.search(query);
-            Result result = insertQuery(query, ParserEnvironment.fromExecutionContext(execution.context()));
-            return (result == null) ? execution.search(query) : result;
+            errorResult = insertQuery(query, ParserEnvironment.fromExecutionContext(execution.context()));
         }
         catch (IllegalArgumentException e) {
             throw new IllegalInputException("Illegal YQL query", e);
         }
+        return (errorResult == null) ? execution.search(query) : errorResult;
     }
 
     private static Result insertQuery(Query query, ParserEnvironment env) {