Make sure we do not get null as response

edalzell · Jan 9, 2022 · 6af6f00 · 6af6f00
1 parent 9422aa8
commit 6af6f00
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/Directives/GlobalSet.php b/src/Directives/GlobalSet.php
@@ -16,7 +16,13 @@ class GlobalSet
 
     public function handleKey(string $handle, string $key = null)
     {
-        return $this->globalSet($handle)->get($key);
+        $globalSet = $this->globalSet($handle);
+
+        if (is_null($globalSet)) {
+            return null;
+        }
+
+        return $globalSet->get($key);
     }
 
     public function handle(string $handle)
@@ -26,6 +32,12 @@ public function handle(string $handle)
 
     private function globalSet(string $handle)
     {
-        return GlobalSetAPI::findByHandle($handle)->inCurrentSite();
+        $handle = GlobalSetAPI::findByHandle($handle);
+
+        if (is_null($handle)) {
+            return null;
+        }
+
+        return $handle->inCurrentSite();
     }
 }