diff --git a/modules.local/ppcp-wc-gateway/src/Exception/NotFoundException.php b/modules.local/ppcp-wc-gateway/src/Exception/NotFoundException.php
new file mode 100644
index 000000000..20759fc5d
--- /dev/null
+++ b/modules.local/ppcp-wc-gateway/src/Exception/NotFoundException.php
@@ -0,0 +1,12 @@
+<?php
+declare(strict_types=1);
+
+namespace Inpsyde\PayPalCommerce\WcGateway\Exception;
+
+use Exception;
+use Psr\Container\NotFoundExceptionInterface;
+
+class NotFoundException extends Exception implements NotFoundExceptionInterface
+{
+
+}
diff --git a/modules.local/ppcp-wc-gateway/src/Settings/Settings.php b/modules.local/ppcp-wc-gateway/src/Settings/Settings.php
index eb550b9f0..2b33f15ed 100644
--- a/modules.local/ppcp-wc-gateway/src/Settings/Settings.php
+++ b/modules.local/ppcp-wc-gateway/src/Settings/Settings.php
@@ -4,9 +4,11 @@ declare(strict_types=1);
 
 namespace Inpsyde\PayPalCommerce\WcGateway\Settings;
 
+use Inpsyde\PayPalCommerce\WcGateway\Exception\NotFoundException;
 use Inpsyde\PayPalCommerce\WcGateway\Gateway\WcGateway;
+use Psr\Container\ContainerInterface;
 
-class Settings
+class Settings implements ContainerInterface
 {
     private $gateway;
     private $formFields;
@@ -18,8 +20,16 @@ class Settings
     }
 
     // phpcs:ignore Inpsyde.CodeQuality.ReturnTypeDeclaration.NoReturnType
-    public function get(string $settingsKey)
+    public function get($id)
     {
-        return $this->gateway->get_option($settingsKey);
+        if (!$this->has($id)) {
+            throw new NotFoundException();
+        }
+        return $this->gateway->get_option($id);
+    }
+
+    public function has($id)
+    {
+        return array_key_exists($id, $this->formFields->fields());
     }
 }