Don't lose illegal argument classification

1 files changed, 5 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java b/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java
index 27e6d6e57a6..c254385a96e 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java
@@ -123,9 +123,13 @@ public class RankProfileList extends Derived implements RankProfilesConfig.Produ
                 rawRankProfiles.put(rawRank.getName(), rawRank);
             }
             return rawRankProfiles;
-        } catch (InterruptedException | ExecutionException e) {
+        } catch (InterruptedException e) {
             throw new IllegalStateException(e);
         }
+        catch (ExecutionException e) {
+            throw e.getCause() instanceof IllegalArgumentException ? (IllegalArgumentException)e.getCause()
+                                                                   : new IllegalStateException(e);
+        }
     }
 
     private static FileDistributedConstants deriveFileDistributedConstants(Schema schema,