Check existence of container cluster

1 files changed, 2 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/CertificateRemovalChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/CertificateRemovalChangeValidator.java
index 50fd6572bcc..1df33ab8517 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/CertificateRemovalChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/CertificateRemovalChangeValidator.java
@@ -17,7 +17,8 @@ public class CertificateRemovalChangeValidator implements ChangeValidator {
 
         current.getContainerClusters()
                 .forEach((clusterId, currentCluster) -> {
-                    validateClients(clusterId, currentCluster.getClients(), next.getContainerClusters().get(clusterId).getClients(), overrides, now);
+                    if(next.getContainerClusters().containsKey(clusterId))
+                        validateClients(clusterId, currentCluster.getClients(), next.getContainerClusters().get(clusterId).getClients(), overrides, now);
                 });
 
         return List.of();