1 files changed, 2 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
index 75b47fbdf60..da7dfdc7b84 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
@@ -17,6 +17,7 @@ import com.yahoo.vespa.model.search.SearchCluster;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -37,7 +38,7 @@ public class LocalProvider extends Provider implements
 
     @Override
     public void getConfig(ClusterConfig.Builder builder) {
-        assert (searchCluster != null) : "Null search cluster!";
+        Objects.requireNonNull(searchCluster,  "Null search cluster!");
         builder.clusterId(searchCluster.getClusterIndex());
         builder.clusterName(searchCluster.getClusterName());