Classify missing node tag for cloud prod as illegal argument

2 files changed, 5 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/processing/AttributesImplicitWord.java b/config-model/src/main/java/com/yahoo/schema/processing/AttributesImplicitWord.java
index 415f23f2786..f0b673920da 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/AttributesImplicitWord.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/AttributesImplicitWord.java
@@ -44,10 +44,8 @@ public class AttributesImplicitWord extends Processor {
 
     private boolean fieldImplicitlyWordMatch(ImmutableSDField field) {
         // numeric types should not trigger exact-match query parsing
-        DataType dt = field.getDataType().getPrimitiveType();
-        if (dt != null && dt instanceof NumericDataType) {
-            return false;
-        }
+        if (field.getDataType().getPrimitiveType() instanceof NumericDataType) return false;
+
         return (! field.hasIndex()
                 && !field.getAttributes().isEmpty()
                 && field.getIndices().isEmpty()
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java
index 29cd44b57a4..4d1f058b005 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java
@@ -35,7 +35,9 @@ public class ProvisionerAdapter implements HostProvisioner {
     @Override
     public HostSpec allocateHost(String alias) {
         // TODO: Remove this method since hosted/non-hosted needs different interfaces. See also ModelContextImpl.getHostProvisioner
-        throw new UnsupportedOperationException("Clusters in hosted environments must have a <nodes count='N'> tag " +
+        // Illegal argument becaiuse we end here by following a path not suitable for the environment steered
+        // by the content of the nodes tag in services
+        throw new IllegalArgumentException("Clusters in hosted environments must have a <nodes count='N'> tag " +
                                                 "matching all zones, and having no <node> subtags, " +
                                                 "see https://cloud.vespa.ai/en/reference/services");
     }