diff --git a/api/src/main/java/me/lucko/luckperms/api/HeldPermission.java b/api/src/main/java/me/lucko/luckperms/api/HeldPermission.java
index 618e8d151..f56f7f65e 100644
--- a/api/src/main/java/me/lucko/luckperms/api/HeldPermission.java
+++ b/api/src/main/java/me/lucko/luckperms/api/HeldPermission.java
@@ -80,14 +80,14 @@ public interface HeldPermission<T> {
      *
      * @return the expiry time
      */
-    OptionalLong getExpiry();
+    @NonNull OptionalLong getExpiry();
 
     /**
      * Gets the extra context for the permission.
      *
      * @return the extra context
      */
-    ContextSet getContexts();
+    @NonNull ContextSet getContexts();
 
     /**
      * Converts this permission into a Node
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/model/NodeHeldPermission.java b/common/src/main/java/me/lucko/luckperms/common/node/model/NodeHeldPermission.java
index 57eac27de..de2dfeab6 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/model/NodeHeldPermission.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/model/NodeHeldPermission.java
@@ -71,11 +71,13 @@ public final class NodeHeldPermission<T extends Comparable<T>> implements HeldPe
         return this.node.getWorld();
     }
 
+    @NonNull
     @Override
     public OptionalLong getExpiry() {
         return this.node.isTemporary() ? OptionalLong.of(this.node.getExpiryUnixTime()) : OptionalLong.empty();
     }
 
+    @NonNull
     @Override
     public ContextSet getContexts() {
         return this.node.getContexts();