1 files changed, 7 insertions, 2 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzPrincipal.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzPrincipal.java
index 8279edcd8e6..b31cb4a26bb 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzPrincipal.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzPrincipal.java
@@ -5,6 +5,7 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.AthenzDomain;
 
 import java.security.Principal;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * @author bjorncs
@@ -14,6 +15,10 @@ public class AthenzPrincipal implements Principal {
     private final AthenzIdentity athenzIdentity;
     private final NToken nToken;
 
+    public AthenzPrincipal(AthenzIdentity athenzIdentity) {
+        this(athenzIdentity, null);
+    }
+
     public AthenzPrincipal(AthenzIdentity athenzIdentity,
                            NToken nToken) {
         this.athenzIdentity = athenzIdentity;
@@ -33,8 +38,8 @@ public class AthenzPrincipal implements Principal {
         return athenzIdentity.getDomain();
     }
 
-    public NToken getNToken() {
-        return nToken;
+    public Optional<NToken> getNToken() {
+        return Optional.ofNullable(nToken);
     }
 
     @Override