Avoid NPE when getting application set for non-loaded session

1 files changed, 1 insertions, 2 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index 95b29235e2f..e677d248630 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -661,8 +661,7 @@ public class SessionRepository {
     private Optional<ApplicationSet> getApplicationSet(long sessionId) {
         Optional<ApplicationSet> applicationSet = Optional.empty();
         try {
-            RemoteSession session = getRemoteSession(sessionId);
-            applicationSet = Optional.ofNullable(ensureApplicationLoaded(session));
+            applicationSet = Optional.ofNullable(getRemoteSession(sessionId)).map(this::ensureApplicationLoaded);
         } catch (IllegalArgumentException e) {
             // Do nothing if we have no currently active session
         }