diff --git a/composer.json b/composer.json
index 9f36a70..71be7b8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "staffbase/plugins-sdk-php",
-	"version": "2.1.1",
+	"version": "2.1.2",
 	"type": "library",
 	"description": "Staffbase PHP SDK library for plugins.",
 	"keywords": ["staffbase", "plugins", "library", "php", "sdk"],
diff --git a/src/SSOData/SSODataTrait.php b/src/SSOData/SSODataTrait.php
index d45cda7..0926c66 100644
--- a/src/SSOData/SSODataTrait.php
+++ b/src/SSOData/SSODataTrait.php
@@ -27,11 +27,9 @@ trait SSODataTrait
     /**
      * Get the branch id of the app that issued the token.
      *
-     * The id will always be present.
-     *
-     * @return string
+     * @return null|string
      */
-    public function getBranchId(): string
+    public function getBranchId(): ?string
     {
         return $this->getClaimSafe(SSODataClaimsInterface::CLAIM_BRANCH_ID);
     }
@@ -61,9 +59,9 @@ public function getSessionId(): ?string
      *
      * The id will always be present.
      *
-     * @return string
+     * @return null|string
      */
-    public function getInstanceId(): string
+    public function getInstanceId(): ?string
     {
         return $this->getClaimSafe(SSODataClaimsInterface::CLAIM_INSTANCE_ID);
     }