1 files changed, 6 insertions, 9 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/ParameterParser.java b/container-search/src/main/java/com/yahoo/search/query/ParameterParser.java
index d358fa06977..3addc1fdb4e 100644
--- a/container-search/src/main/java/com/yahoo/search/query/ParameterParser.java
+++ b/container-search/src/main/java/com/yahoo/search/query/ParameterParser.java
@@ -1,6 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.query;
 
+import com.yahoo.processing.IllegalInputException;
+
 import static com.yahoo.container.util.Util.quote;
 
 /**
@@ -25,13 +27,8 @@ public class ParameterParser {
      *         representation cannot be parsed as a number followed optionally by time unit
      */
     public static Long asMilliSeconds(Object value, Long defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Number) {
-            Number n = (Number) value;
-            return Long.valueOf(n.longValue() * 1000L);
-        }
+        if (value == null) return defaultValue;
+        if (value instanceof Number) return ((Number)value).longValue() * 1000L;
         return parseTime(value.toString());
     }
 
@@ -43,7 +40,7 @@ public class ParameterParser {
             double multiplier = parseUnit(time.substring(unitOffset));
             return (long) (measure * multiplier);
         } catch (RuntimeException e) {
-            throw new IllegalArgumentException("Error parsing " + quote(time), e);
+            throw new IllegalInputException("Error parsing " + quote(time), e);
         }
     }
 
@@ -58,7 +55,7 @@ public class ParameterParser {
             }
         }
         if (unitOffset == 0) {
-            throw new NumberFormatException("Invalid number " + quote(time));
+            throw new IllegalInputException("Invalid number " + quote(time));
         }
         return unitOffset;
     }