1 files changed, 1 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
index 529cdd19990..c7b19968f0a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
@@ -156,9 +156,7 @@ public class SessionZooKeeperClient {
     }
 
     public Optional<ApplicationId> readApplicationId() {
-        Optional<byte[]> data = curator.getData(applicationIdPath());
-        if (data.isEmpty()) return Optional.empty();
-        return Optional.of(ApplicationId.fromSerializedForm(Utf8.toString(data.get())));
+        return curator.getData(applicationIdPath()).map(d -> ApplicationId.fromSerializedForm(Utf8.toString(d)));
     }
 
     void writeApplicationPackageReference(Optional<FileReference> applicationPackageReference) {