Expect the correction exceptions

2 files changed, 3 insertions, 3 deletions

diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolver.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolver.java
index 4cf5b24941e..47d4e789602 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolver.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolver.java
@@ -15,7 +15,7 @@ public class MathResolver {
 
     public void push(ArithmeticExpression.Operator op, Expression exp) {
         if (items.isEmpty() && op != ArithmeticExpression.Operator.ADD)
-            throw new IllegalArgumentException("First item in an arithmetic operation must be an addition.");
+            throw new IllegalArgumentException("First item in an arithmetic operation must be an addition, not " + op);
         items.add(new Item(op, exp));
     }
 
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolverTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolverTestCase.java
index decd0d7670e..1f9afdea44d 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolverTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolverTestCase.java
@@ -71,7 +71,7 @@ public class MathResolverTestCase {
             try {
                 resolver.push(type, newInteger(69));
             } catch (IllegalArgumentException e) {
-                assertEquals("First item in an arithmetic operation must be an addition.", e.getMessage());
+                assertEquals("First item in an arithmetic operation must be an addition, not " + type, e.getMessage());
             }
         }
     }
@@ -81,7 +81,7 @@ public class MathResolverTestCase {
         try {
             new MathResolver().push(null, newInteger(69));
             fail();
-        } catch (NullPointerException e) {
+        } catch (IllegalArgumentException e) {
 
         }
     }