Merge branch 'master' into bjormel/aws-main-controller

1 files changed, 3 insertions, 3 deletions

diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java
index c7cf7066483..3bf67ff9c5d 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java
@@ -70,7 +70,7 @@ public final class SwitchExpression extends CompositeExpression {
         if (input != null) {
             if (!(input instanceof StringFieldValue)) {
                 throw new IllegalArgumentException("Expected " + DataType.STRING.getName() + " input, got " +
-                                                   input.getDataType().getName() + ".");
+                                                   input.getDataType().getName());
             }
             exp = cases.get(String.valueOf(input));
         }
@@ -95,11 +95,11 @@ public final class SwitchExpression extends CompositeExpression {
     protected void doVerify(VerificationContext context) {
         DataType input = context.getValueType();
         if (input == null) {
-            throw new VerificationException(this, "Expected " + DataType.STRING.getName() + " input, got null.");
+            throw new VerificationException(this, "Expected " + DataType.STRING.getName() + " input, but no input is specified");
         }
         if (input != DataType.STRING) {
             throw new VerificationException(this, "Expected " + DataType.STRING.getName() + " input, got " +
-                                                  input.getName() + ".");
+                                                  input.getName());
         }
         for (Expression exp : cases.values()) {
             context.setValueType(input).execute(exp);