diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php
index 32324873a9f6..4614d1486cea 100644
--- a/app/Http/Controllers/SelfUpdateController.php
+++ b/app/Http/Controllers/SelfUpdateController.php
@@ -69,39 +69,7 @@ class SelfUpdateController extends BaseController
      *       ),
      *     )
      */
-    // public function old_update(\Codedge\Updater\UpdaterManager $updater)
-    // {
-    //     set_time_limit(0);
-    //     define('STDIN', fopen('php://stdin', 'r'));
-
-    //     if (Ninja::isHosted()) {
-    //         return response()->json(['message' => ctrans('texts.self_update_not_available')], 403);
-    //     }
-
-    //     $this->testWritable();
-
-    //     // Get the new version available
-    //     $versionAvailable = $updater->source()->getVersionAvailable();
-
-    //     // Create a release
-    //     $release = $updater->source()->fetch($versionAvailable);
-
-    //     $updater->source()->update($release);
-
-    //     $cacheCompiled = base_path('bootstrap/cache/compiled.php');
-    //     if (file_exists($cacheCompiled)) { unlink ($cacheCompiled); }
-    //     $cacheServices = base_path('bootstrap/cache/services.php');
-    //     if (file_exists($cacheServices)) { unlink ($cacheServices); }
-
-    //     Artisan::call('clear-compiled');
-    //     Artisan::call('route:clear');
-    //     Artisan::call('view:clear');
-    //     Artisan::call('optimize');
-
-    //     return response()->json(['message' => 'Update completed'], 200);
-
-    // }
-
+ 
     public function update()
     {
         set_time_limit(0);
diff --git a/app/PaymentDrivers/CheckoutComPaymentDriver.php b/app/PaymentDrivers/CheckoutComPaymentDriver.php
index fffdd8edf1dd..2a7a9e94518b 100644
--- a/app/PaymentDrivers/CheckoutComPaymentDriver.php
+++ b/app/PaymentDrivers/CheckoutComPaymentDriver.php
@@ -12,6 +12,7 @@
 
 namespace App\PaymentDrivers;
 
+use App\Exceptions\PaymentFailed;
 use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
 use App\Http\Requests\Gateways\Checkout3ds\Checkout3dsRequest;
 use App\Http\Requests\Payments\PaymentWebhookRequest;
@@ -254,12 +255,13 @@ class CheckoutComPaymentDriver extends BaseDriver
             ];
         } catch (CheckoutApiException $e) {
             // API error
-            $request_id = $e->request_id;
-            $http_status_code = $e->http_status_code;
-            $error_details = $e->error_details;
+            throw new PaymentFailed($e->getMessage(), $e->getCode());
+
         } catch (CheckoutArgumentException $e) {
             // Bad arguments
 
+            throw new PaymentFailed($e->getMessage(), $e->getCode());
+
             return [
                 'transaction_reference' => null,
                 'transaction_response' => json_encode($e->getMessage()),
@@ -270,6 +272,8 @@ class CheckoutComPaymentDriver extends BaseDriver
         } catch (CheckoutAuthorizationException $e) {
             // Bad Invalid authorization
 
+            throw new PaymentFailed($e->getMessage(), $e->getCode());
+
             return [
                 'transaction_reference' => null,
                 'transaction_response' => json_encode($e->getMessage()),