Simplify

1 files changed, 2 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackageValidator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackageValidator.java
index c2a5389000b..b245718171f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackageValidator.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackageValidator.java
@@ -153,10 +153,10 @@ public class ApplicationPackageValidator {
         return instance.globalServiceId().map(globalServiceId -> {
             var regions = instance.zones().stream()
                                   .filter(zone -> zone.environment().isProduction())
-                                  .map(zone -> zone.region().get())
+                                  .flatMap(zone -> zone.region().stream())
                                   .map(RegionName::value)
                                   .collect(Collectors.toSet());
-            return new Endpoint(Optional.of(EndpointId.defaultId().id()), instance.globalServiceId().get(), regions);
+            return new Endpoint(Optional.of(EndpointId.defaultId().id()), globalServiceId, regions);
         });
     }