1 files changed, 8 insertions, 8 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
index e9b23461527..82c793af70a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
@@ -7,9 +7,9 @@ import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.path.Path;
 import com.yahoo.searchdefinition.RankingConstant;
+import com.yahoo.searchdefinition.Schema;
 import com.yahoo.vespa.model.VespaModel;
-import com.yahoo.vespa.model.application.validation.ConstantTensorJsonValidator.InvalidConstantTensor;
-import com.yahoo.vespa.model.search.NamedSchema;
+import com.yahoo.vespa.model.application.validation.ConstantTensorJsonValidator.InvalidConstantTensorException;
 
 import java.io.FileNotFoundException;
 
@@ -36,8 +36,8 @@ public class RankingConstantsValidator extends Validator {
         }
     }
 
-    static class TensorValidationFailed extends RuntimeException {
-        TensorValidationFailed(String message) {
+    static class TensorValidationException extends IllegalArgumentException {
+        TensorValidationException(String message) {
             super(message);
         }
     }
@@ -47,18 +47,18 @@ public class RankingConstantsValidator extends Validator {
         ApplicationPackage applicationPackage = deployState.getApplicationPackage();
         ExceptionMessageCollector exceptionMessageCollector = new ExceptionMessageCollector("Invalid constant tensor file(s):");
 
-        for (NamedSchema sd : deployState.getSchemas()) {
-            for (RankingConstant rc : sd.getSearch().rankingConstants().asMap().values()) {
+        for (Schema schema : deployState.getSchemas()) {
+            for (RankingConstant rc : schema.rankingConstants().asMap().values()) {
                 try {
                     validateRankingConstant(rc, applicationPackage);
-                } catch (InvalidConstantTensor | FileNotFoundException ex) {
+                } catch (InvalidConstantTensorException | FileNotFoundException ex) {
                     exceptionMessageCollector.add(ex, rc.getName(), rc.getFileName());
                 }
             }
         }
 
         if (exceptionMessageCollector.exceptionsOccurred) {
-            throw new TensorValidationFailed(exceptionMessageCollector.combinedMessage);
+            throw new TensorValidationException(exceptionMessageCollector.combinedMessage);
         }
     }