Ensure that terms are not empty.

2 files changed, 2 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java b/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java
index 361993900ba..a89231b30ae 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java
@@ -72,6 +72,7 @@ public class WordItem extends TermItem {
 
     public void setWord(String word) {
         Validator.ensureNotNull("Word item word", word);
+        Validator.ensureNonEmpty("Word item word", word);
         this.word = word;
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java
index d3916c4bfe1..ca7d0dbca0a 100644
--- a/container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java
@@ -89,7 +89,7 @@ public abstract class LowercasingSearcher extends Searcher {
     }
 
     private boolean syntheticLowerCaseCheck(String indexName, IndexFacts.Session indexFacts, boolean isFromQuery) {
-        WordItem w = new WordItem("", indexName, isFromQuery);
+        WordItem w = new WordItem("not-used", indexName, isFromQuery);
         return shouldLowercase(w, indexFacts);
     }