Nicer deploy errors

2 files changed, 3 insertions, 1 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
index 8a541abf4ae..d32d1a4e000 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
@@ -134,7 +134,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
                 }
                 else {
                     if (e instanceof IllegalArgumentException) {
-                        var wrapped = new InvalidApplicationException("Error loading " + applicationId, e);
+                        var wrapped = new InvalidApplicationException("Invalid application", e);
                         deployLogger.logApplicationPackage(Level.SEVERE, Exceptions.toMessageString(wrapped));
                         throw wrapped;
                     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 8d023cac88a..4928af488e1 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -148,6 +148,8 @@ public class SessionPreparer {
             return preparation.result();
         }
         catch (IllegalArgumentException e) {
+            if (e instanceof InvalidApplicationException)
+                throw e;
             throw new InvalidApplicationException("Invalid application package", e);
         }
     }