Ensure that we get the offending query when a stackoverflow occur.

1 files changed, 2 insertions, 2 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java
index 1e3f11f4f78..dc8e2b70740 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -663,7 +663,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
         // getQueryTree isn't exception safe
         try {
             queryTree = model.getQueryTree().toString();
-        } catch (Exception e) {
+        } catch (Exception | StackOverflowError e) {
             queryTree = "[Could not parse user input: " + model.getQueryString() + "]";
         }
         return "query '" + queryTree + "'";
@@ -675,7 +675,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
         // getQueryTree isn't exception safe
         try {
             queryTree = model.getQueryTree().toString();
-        } catch (Exception e) {
+        } catch (Exception | StackOverflowError e) {
             queryTree = "Could not parse user input: " + model.getQueryString();
         }
         return "query=[" + queryTree + "]" + " offset=" + getOffset() + " hits=" + getHits() + "]";