diff --git a/composer.json b/composer.json
index 2c6317c..c189faa 100644
--- a/composer.json
+++ b/composer.json
@@ -19,9 +19,9 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2|^8.0",
         "karser/payum-saferpay": "^0.3",
-        "coreshop/core-shop": "^2.2"
+        "coreshop/core-shop": "^2.2|^3.0"
     },
     "config": {
         "bin-dir": "bin"
diff --git a/src/CoreShop/Payum/Saferpay/Extension/ConvertPaymentExtension.php b/src/CoreShop/Payum/Saferpay/Extension/ConvertPaymentExtension.php
index 0265fe7..fd754a5 100644
--- a/src/CoreShop/Payum/Saferpay/Extension/ConvertPaymentExtension.php
+++ b/src/CoreShop/Payum/Saferpay/Extension/ConvertPaymentExtension.php
@@ -42,7 +42,7 @@ public function onPostExecute(Context $context)
     {
         $action = $context->getAction();
 
-        $previousActionClassName = get_class($action);
+        $previousActionClassName = is_object($action) ? get_class($action) : false;
         if (false === stripos($previousActionClassName, 'ConvertPaymentAction')) {
             return;
         }