1 files changed, 7 insertions, 1 deletions
diff --git a/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStoreValidationHandler.java b/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStoreValidationHandler.java
index d813f04512a..665e55c8f24 100644
--- a/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStoreValidationHandler.java
+++ b/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStoreValidationHandler.java
@@ -49,7 +49,13 @@ public class AwsParameterStoreValidationHandler extends LoggingRequestHandler {
 
     private HttpResponse handlePOST(HttpRequest request) {
         var json = toSlime(request.getData());
-        var settings = AwsSettings.fromSlime(json);
+        AwsSettings settings;
+
+        try {
+            settings = AwsSettings.fromSlime(json);
+        } catch (IllegalArgumentException e) {
+            return ErrorResponse.badRequest(Exceptions.toMessageString(e));
+        }
 
         var response = new Slime();
         var root = response.setObject();