1 files changed, 3 insertions, 4 deletions
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java
index 02c68bdf967..68b9e79e092 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java
@@ -46,8 +46,7 @@ public final class ArithmeticExpression extends CompositeExpression {
     private final Expression rhs;
 
     public ArithmeticExpression(Expression lhs, Operator op, Expression rhs) {
-        super(null);
-        setInputType(requiredInputType(lhs, rhs));
+        super(requiredInputType(lhs, rhs));
         lhs.getClass(); // throws NullPointerException
         op.getClass();
         rhs.getClass();
@@ -82,7 +81,7 @@ public final class ArithmeticExpression extends CompositeExpression {
                                   context.setValue(input).execute(rhs).getValue()));
     }
 
-    private DataType requiredInputType(Expression lhs, Expression rhs) {
+    private static DataType requiredInputType(Expression lhs, Expression rhs) {
         DataType lhsType = lhs.requiredInputType();
         DataType rhsType = rhs.requiredInputType();
         if (lhsType == null) {
@@ -92,7 +91,7 @@ public final class ArithmeticExpression extends CompositeExpression {
             return lhsType;
         }
         if (!lhsType.equals(rhsType)) {
-            throw new VerificationException(this, "Operands require conflicting input types, " +
+            throw new VerificationException(ArithmeticExpression.class, "Operands require conflicting input types, " +
                                                   lhsType.getName() + " vs " + rhsType.getName() + ".");
         }
         return lhsType;