diff --git a/src/cartridges/bm_adyen/cartridge/controllers/AdyenSettings.js b/src/cartridges/bm_adyen/cartridge/controllers/AdyenSettings.js
index 61aea9b11..e26853c16 100644
--- a/src/cartridges/bm_adyen/cartridge/controllers/AdyenSettings.js
+++ b/src/cartridges/bm_adyen/cartridge/controllers/AdyenSettings.js
@@ -24,7 +24,8 @@ server.post('Save', server.middleware.https, (req, res, next) => {
     });
   } catch (error) {
     AdyenLogs.error_log(
-      `Error while saving settings in BM configuration: ${error}`,
+      'Error while saving settings in BM configuration:',
+      error,
     );
     res.json({
       success: false,
@@ -67,7 +68,7 @@ server.post('TestConnection', server.middleware.https, (req, res, next) => {
       error: false,
     });
   } catch (error) {
-    AdyenLogs.error_log(`Error while testing API credentials: ${error}`);
+    AdyenLogs.error_log('Error while testing API credentials:', error);
     res.json({
       error: true,
       message: 'an unknown error has occurred',
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/donations/adyenGiving.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/donations/adyenGiving.js
index 82d1149d7..24bace465 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/donations/adyenGiving.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/donations/adyenGiving.js
@@ -100,10 +100,8 @@ function donate(donationReference, donationAmount, orderToken) {
       }
     });
     return response;
-  } catch (e) {
-    AdyenLogs.error_log(
-      `Adyen: ${e.toString()} in ${e.fileName}:${e.lineNumber}`,
-    );
+  } catch (error) {
+    AdyenLogs.error_log('/donations call failed:', error);
     return { error: true };
   }
 }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/expressPayments/saveExpressShopperDetails.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/expressPayments/saveExpressShopperDetails.js
index 123e99957..c890411dd 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/expressPayments/saveExpressShopperDetails.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/expressPayments/saveExpressShopperDetails.js
@@ -71,8 +71,11 @@ function saveExpressShopperDetails(req, res, next) {
     );
     res.json({ shippingMethods });
     return next();
-  } catch (e) {
-    AdyenLogs.error_log('Could not save amazon express shopper details');
+  } catch (error) {
+    AdyenLogs.error_log(
+      'Could not save amazon express shopper details:',
+      error,
+    );
     res.redirect(URLUtils.url('Error-ErrorCode', 'err', 'general'));
     return next();
   }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/__tests__/__snapshots__/posAuthorize.test.js.snap b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/__tests__/__snapshots__/posAuthorize.test.js.snap
index 08cc0654f..18bfe0f5b 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/__tests__/__snapshots__/posAuthorize.test.js.snap
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/__tests__/__snapshots__/posAuthorize.test.js.snap
@@ -11,14 +11,6 @@ exports[`POS Authorize should return error if createTerminalPayment fails 1`] =
 }
 `;
 
-exports[`POS Authorize should return error if createTerminalPayment fails 2`] = `
-[
-  [
-    "POS Authorise error, result: mockedResponse",
-  ],
-]
-`;
-
 exports[`POS Authorize should return error if there is no terminal ID 1`] = `
 {
   "authorized": false,
@@ -30,14 +22,6 @@ exports[`POS Authorize should return error if there is no terminal ID 1`] = `
 }
 `;
 
-exports[`POS Authorize should return error if there is no terminal ID 2`] = `
-[
-  [
-    "No terminal selected",
-  ],
-]
-`;
-
 exports[`POS Authorize should return success response when createTerminalPayment passes 1`] = `
 {
   "response": "mockedSuccessResponse",
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/__tests__/posAuthorize.test.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/__tests__/posAuthorize.test.js
index 91e861d18..d16dc7e69 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/__tests__/posAuthorize.test.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/__tests__/posAuthorize.test.js
@@ -35,25 +35,24 @@ describe('POS Authorize', () => {
       paymentProcessor,
     );
     expect(authorizeResult).toMatchSnapshot();
-    expect(Logger.fatal.mock.calls).toMatchSnapshot();
+    expect(Logger.fatal.mock.calls.length).toBe(1);
   });
 
   it('should return error if createTerminalPayment fails', () => {
     const {
       createTerminalPayment,
     } = require('*/cartridge/adyen/scripts/payments/adyenTerminalApi');
-    createTerminalPayment.mockImplementation(() => ({
-      error: true,
-      response: 'mockedResponse',
-    }));
-
+    const mockError = new Error('API error');
+    createTerminalPayment.mockImplementation(() => {
+		throw mockError;
+    });
     const authorizeResult = posAuthorize(
       orderNumber,
       paymentInstrument,
       paymentProcessor,
     );
+    expect(Logger.fatal.mock.calls.length).toBe(1);
     expect(authorizeResult).toMatchSnapshot();
-    expect(Logger.fatal.mock.calls).toMatchSnapshot();
   });
 
   it('should return success response when createTerminalPayment passes', () => {
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/authorize.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/authorize.js
index a085a4a5d..a7d155c4b 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/authorize.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/authorize.js
@@ -18,7 +18,7 @@ function errorHandler() {
 }
 
 function paymentErrorHandler(result) {
-  AdyenLogs.error_log(`Payment failed, result: ${JSON.stringify(result)}`);
+  AdyenLogs.error_log('Payment failed:', JSON.stringify(result));
   Transaction.rollback();
   return { error: true };
 }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/posAuthorize.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/posAuthorize.js
index 31c9bc608..cf1043762 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/posAuthorize.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/posAuthorize.js
@@ -8,16 +8,25 @@ const AdyenLogs = require('*/cartridge/adyen/logs/adyenCustomLogs');
  * Authorize
  */
 function posAuthorize(order, paymentInstrument, paymentProcessor) {
-  Transaction.wrap(() => {
-    paymentInstrument.paymentTransaction.transactionID = order.orderNo;
-    paymentInstrument.paymentTransaction.paymentProcessor = paymentProcessor;
-  });
+  try {
+    Transaction.wrap(() => {
+      paymentInstrument.paymentTransaction.transactionID = order.orderNo;
+      paymentInstrument.paymentTransaction.paymentProcessor = paymentProcessor;
+    });
 
-  const adyenPaymentForm = server.forms.getForm('billing').adyenPaymentFields;
-  const terminalId = adyenPaymentForm.terminalId.value;
+    const adyenPaymentForm = server.forms.getForm('billing').adyenPaymentFields;
+    const terminalId = adyenPaymentForm?.terminalId.value;
 
-  if (!terminalId) {
-    AdyenLogs.fatal_log('No terminal selected');
+    if (!terminalId) {
+      throw new Error('No terminal selected');
+    }
+    return adyenTerminalApi.createTerminalPayment(
+      order,
+      paymentInstrument,
+      terminalId,
+    );
+  } catch (error) {
+    AdyenLogs.fatal_log('POS Authorise error', error);
     const errors = [
       Resource.msg('error.payment.processor.not.supported', 'checkout', null),
     ];
@@ -28,25 +37,6 @@ function posAuthorize(order, paymentInstrument, paymentProcessor) {
       error: true,
     };
   }
-
-  const result = adyenTerminalApi.createTerminalPayment(
-    order,
-    paymentInstrument,
-    terminalId,
-  );
-  if (result.error) {
-    AdyenLogs.fatal_log(`POS Authorise error, result: ${result.response}`);
-    const errors = [
-      Resource.msg('error.payment.processor.not.supported', 'checkout', null),
-    ];
-    return {
-      authorized: false,
-      fieldErrors: [],
-      serverErrors: errors,
-      error: true,
-    };
-  }
-  return result;
 }
 
 module.exports = posAuthorize;
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/processForm.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/processForm.js
index 14a758682..1b665d2fd 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/processForm.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/hooks/payment/processor/middlewares/processForm.js
@@ -90,7 +90,7 @@ function getPaymentMethodFromForm(paymentForm) {
     return JSON.parse(paymentForm.adyenPaymentFields?.adyenStateData?.value)
       .paymentMethod;
   } catch (error) {
-    AdyenLogs.error_log('Failed to parse payment form stateData');
+    AdyenLogs.error_log('Failed to parse payment form stateData:', error);
     return {};
   }
 }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/cancelPartialPaymentOrder.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/cancelPartialPaymentOrder.js
index f9c5f75ea..d51fff773 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/cancelPartialPaymentOrder.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/cancelPartialPaymentOrder.js
@@ -50,9 +50,7 @@ function cancelPartialPaymentOrder(req, res, next) {
       amount,
     });
   } catch (error) {
-    AdyenLogs.error_log(
-      `Could not cancel partial payments order.. ${error.toString()}`,
-    );
+    AdyenLogs.error_log('Could not cancel partial payments order:', error);
     res.json({
       error: true,
       errorMessage: Resource.msg('error.technical', 'checkout', null),
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/checkBalance.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/checkBalance.js
index e4252be7c..dd8430dd9 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/checkBalance.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/checkBalance.js
@@ -76,9 +76,7 @@ function callCheckBalance(req, res, next) {
       ...getFormattedProperties(checkBalanceResponse, orderAmount),
     });
   } catch (error) {
-    AdyenLogs.error_log(
-      `Failed to check gift card balance ${error.toString()}`,
-    );
+    AdyenLogs.error_log('Failed to check gift card balance:', error);
     res.json({ error: true });
   }
   return next();
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/fetchGiftCards.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/fetchGiftCards.js
index 4b3930663..c6aac30c9 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/fetchGiftCards.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/fetchGiftCards.js
@@ -31,7 +31,7 @@ function fetchGiftCards(req, res, next) {
       totalDiscountedAmount,
     });
   } catch (error) {
-    AdyenLogs.error_log(`Failed to fetch gift cards ${error.toString()}`);
+    AdyenLogs.error_log('Failed to fetch gift cards:', error);
     const currentBasket = BasketMgr.getCurrentBasket();
     clearForms.clearAdyenBasketData(currentBasket);
     res.json({ error: true });
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/partialPayment.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/partialPayment.js
index beaa1b05e..51e4b4a58 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/partialPayment.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/partialPayment.js
@@ -140,9 +140,7 @@ function makePartialPayment(req, res, next) {
       ),
     });
   } catch (error) {
-    AdyenLogs.error_log(
-      `Failed to create partial payment.. ${error.toString()}`,
-    );
+    AdyenLogs.error_log('Failed to create partial payment:', error);
     res.json({ error: true });
   }
   return next();
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/partialPaymentsOrder.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/partialPaymentsOrder.js
index ff5de03e2..d7356ee21 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/partialPaymentsOrder.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/partialPayments/partialPaymentsOrder.js
@@ -57,9 +57,7 @@ function createPartialPaymentsOrder(req, res, next) {
 
     res.json(responseData);
   } catch (error) {
-    AdyenLogs.error_log(
-      `Failed to create partial payments order.. ${error.toString()}`,
-    );
+    AdyenLogs.error_log('Failed to create partial payments order:', error);
     res.json({ error: true });
   }
 
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenCheckout.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenCheckout.js
index 303eb89a5..3ab118874 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenCheckout.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenCheckout.js
@@ -118,10 +118,8 @@ function doPaymentsCall(order, paymentInstrument, paymentRequest) {
       AdyenLogs.info_log('Payment result: Refused');
     }
     return paymentResponse;
-  } catch (e) {
-    AdyenLogs.fatal_log(
-      `Adyen: ${e.toString()} in ${e.fileName}:${e.lineNumber}`,
-    );
+  } catch (error) {
+    AdyenLogs.fatal_log('Payments call failed:', error);
     return {
       error: true,
       args: {
@@ -269,12 +267,8 @@ function createPaymentRequest(args) {
       paymentRequest.paymentMethod,
     );
     return doPaymentsCall(order, paymentInstrument, paymentRequest);
-  } catch (e) {
-    AdyenLogs.error_log(
-      `error processing payment. Error message: ${
-        e.message
-      } more details: ${e.toString()} in ${e.fileName}:${e.lineNumber}`,
-    );
+  } catch (error) {
+    AdyenLogs.error_log('Error processing payment:', error);
     return { error: true };
   }
 }
@@ -285,8 +279,8 @@ function doPaymentsDetailsCall(paymentDetailsRequest) {
       constants.SERVICE.PAYMENTDETAILS,
       paymentDetailsRequest,
     );
-  } catch (ex) {
-    AdyenLogs.error_log(`error parsing response object ${ex.message}`);
+  } catch (error) {
+    AdyenLogs.error_log('Error parsing response object:', error);
     return { error: true };
   }
 }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenDeleteRecurringPayment.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenDeleteRecurringPayment.js
index 00df9cdbd..740fb4f96 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenDeleteRecurringPayment.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenDeleteRecurringPayment.js
@@ -57,10 +57,8 @@ function deleteRecurringPayment(args) {
       constants.SERVICE.RECURRING_DISABLE,
       requestObject,
     );
-  } catch (e) {
-    AdyenLogs.fatal_log(
-      `Adyen: ${e.toString()} in ${e.fileName}:${e.lineNumber}`,
-    );
+  } catch (error) {
+    AdyenLogs.fatal_log('/disable call failed', error);
     return { error: true };
   }
 }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenGetPaymentMethods.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenGetPaymentMethods.js
index c423f14c4..cbb857ad7 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenGetPaymentMethods.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenGetPaymentMethods.js
@@ -80,10 +80,8 @@ function getMethods(basket, customer, countryCode) {
       constants.SERVICE.CHECKOUTPAYMENTMETHODS,
       paymentMethodsRequest,
     );
-  } catch (e) {
-    AdyenLogs.fatal_log(
-      `Adyen: ${e.toString()} in ${e.fileName}:${e.lineNumber}`,
-    );
+  } catch (error) {
+    AdyenLogs.fatal_log('/paymentMethods call failed', error);
     return { error: true };
   }
 }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenTerminalApi.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenTerminalApi.js
index c67ed5deb..30f016f0d 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenTerminalApi.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenTerminalApi.js
@@ -42,10 +42,8 @@ function getTerminals() {
 
     requestObject.request = getTerminalRequest;
     return executeCall(constants.SERVICE.CONNECTEDTERMINALS, requestObject);
-  } catch (e) {
-    AdyenLogs.fatal_log(
-      `Adyen getTerminals: ${e.toString()} in ${e.fileName}:${e.lineNumber}`,
-    );
+  } catch (error) {
+    AdyenLogs.fatal_log('/getTerminals call failed', error);
     return { error: true, response: '{}' };
   }
 }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenZeroAuth.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenZeroAuth.js
index 9a508eb11..3a3594af6 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenZeroAuth.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenZeroAuth.js
@@ -60,12 +60,8 @@ function zeroAuthPayment(customer, paymentInstrument) {
       paymentInstrument,
       zeroAuthRequest,
     );
-  } catch (e) {
-    AdyenLogs.error_log(
-      `error processing zero auth payment. Error message: ${
-        e.message
-      } more details: ${e.toString()} in ${e.fileName}:${e.lineNumber}`,
-    );
+  } catch (error) {
+    AdyenLogs.error_log('error processing zero auth payment:', error);
     return { error: true };
   }
 }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/getCheckoutPaymentMethods.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/getCheckoutPaymentMethods.js
index e218b8f73..1e8a174b5 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/getCheckoutPaymentMethods.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/getCheckoutPaymentMethods.js
@@ -66,10 +66,8 @@ function getCheckoutPaymentMethods(req, res, next) {
       countryCode,
       applicationInfo: AdyenHelper.getApplicationInfo(),
     });
-  } catch (err) {
-    AdyenLogs.fatal_log(
-      `Failed to fetch payment methods ${JSON.stringify(err)}`,
-    );
+  } catch (error) {
+    AdyenLogs.fatal_log('Failed to fetch payment methods', error);
     res.json({ error: true });
   }
   return next();
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/paymentsDetails.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/paymentsDetails.js
index b0052d14a..b974e4872 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/paymentsDetails.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/paymentsDetails.js
@@ -65,12 +65,8 @@ function paymentsDetails(req, res, next) {
 
     res.json(response);
     return next();
-  } catch (e) {
-    AdyenLogs.error_log(
-      `Could not verify /payment/details: ${e.toString()} in ${e.fileName}:${
-        e.lineNumber
-      }`,
-    );
+  } catch (error) {
+    AdyenLogs.error_log('Could not verify /payment/details:', error);
     res.redirect(URLUtils.url('Error-ErrorCode', 'err', 'general'));
     return next();
   }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/redirect3ds1Response.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/redirect3ds1Response.js
index 3ab8d29c1..87f741520 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/redirect3ds1Response.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/redirect3ds1Response.js
@@ -26,12 +26,8 @@ function redirect(req, res, next) {
     }
 
     return next();
-  } catch (e) {
-    AdyenLogs.error_log(
-      `Error during 3ds1 response verification: ${e.toString()} in ${
-        e.fileName
-      }:${e.lineNumber}`,
-    );
+  } catch (error) {
+    AdyenLogs.error_log('Error during 3ds1 response verification:', error);
     res.redirect(URLUtils.url('Error-ErrorCode', 'err', 'general'));
     return next();
   }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/updateSavedCards.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/updateSavedCards.js
index 6312c0413..6bfffe03e 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/updateSavedCards.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/updateSavedCards.js
@@ -59,10 +59,7 @@ function updateSavedCards(args) {
     if (
       !(customer && customer.getProfile() && customer.getProfile().getWallet())
     ) {
-      AdyenLogs.error_log(
-        'Error while updating saved cards, could not get customer data',
-      );
-      return { error: true };
+	  throw new Error('Error while updating saved cards, could not get customer data');
     }
 
     if (AdyenConfigs.getAdyenRecurringPaymentsEnabled()) {
@@ -127,8 +124,8 @@ function updateSavedCards(args) {
       });
     }
     return { error: false };
-  } catch (ex) {
-    AdyenLogs.error_log(`${ex.toString()} in ${ex.fileName}:${ex.lineNumber}`);
+  } catch (error) {
+    AdyenLogs.error_log('Error while updating saved cards:', error);
     return { error: true };
   }
 }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/showConfirmation/showConfirmation.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/showConfirmation/showConfirmation.js
index dc6ae4b88..b822a82b9 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/showConfirmation/showConfirmation.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/showConfirmation/showConfirmation.js
@@ -124,12 +124,8 @@ function showConfirmation(req, res, next) {
       );
     }
     throw new Error(`Incorrect signature for order ${merchantReference}`);
-  } catch (e) {
-    AdyenLogs.error_log(
-      `Could not verify /payment/details: ${e.toString()} in ${e.fileName}:${
-        e.lineNumber
-      }`,
-    );
+  } catch (error) {
+    AdyenLogs.error_log('Could not verify /payment/details', error);
     res.redirect(URLUtils.url('Error-ErrorCode', 'err', 'general'));
     return next();
   }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/showConfirmation/showConfirmationPaymentFromComponent.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/showConfirmation/showConfirmationPaymentFromComponent.js
index afa863138..d68a6f915 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/showConfirmation/showConfirmationPaymentFromComponent.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/showConfirmation/showConfirmationPaymentFromComponent.js
@@ -16,12 +16,8 @@ function showConfirmationPaymentFromComponent(req, res, next) {
       req.form.orderToken,
     );
     return handlePayment(stateData, order, options);
-  } catch (e) {
-    AdyenLogs.error_log(
-      `Could not verify /payment/details: ${e.toString()} in ${e.fileName}:${
-        e.lineNumber
-      }`,
-    );
+  } catch (error) {
+    AdyenLogs.error_log('Could not verify /payment/details', error);
     res.redirect(URLUtils.url('Error-ErrorCode', 'err', 'general'));
     return next();
   }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/adyenHelper.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/adyenHelper.js
index 7900603f1..b7a21555e 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/adyenHelper.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/adyenHelper.js
@@ -61,9 +61,8 @@ let adyenHelperObj = {
         },
       });
       AdyenLogs.info_log(`Successfully retrieve service with name ${service}`);
-    } catch (e) {
-      AdyenLogs.error_log(`Can't get service instance with name ${service}`);
-      // e.message
+    } catch (error) {
+      AdyenLogs.error_log(`Can't get service instance with name ${service}`, error);
     }
     return adyenService;
   },
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks/deleteCustomObjects.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks/deleteCustomObjects.js
index 46e0e6394..cc9801da9 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks/deleteCustomObjects.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks/deleteCustomObjects.js
@@ -30,10 +30,8 @@ function remove(co) {
   );
   try {
     CustomObjectMgr.remove(co);
-  } catch (e) {
-    AdyenLogs.error_log(
-      `Error occured during delete CO, ID: ${co.custom.orderId}, erorr message ${e.message}`,
-    );
+  } catch (error) {
+    AdyenLogs.error_log('Error occured during delete CO, ID: ${co.custom.orderId}, erorr message ${e.message}', error);
   }
 }
 
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks/handleNotify.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks/handleNotify.js
index bf59229bc..0b8037d86 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks/handleNotify.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks/handleNotify.js
@@ -106,14 +106,11 @@ function notify(notificationData) {
     return {
       success: true,
     };
-  } catch (e) {
-    AdyenLogs.error_log(
-      `Notification failed: ${JSON.stringify(notificationData)}\n` +
-        `Error message: ${e.message}`,
-    );
+  } catch (error) {
+    AdyenLogs.error_log('Notification failed',error);
     return {
       success: false,
-      errorMessage: e.message,
+      errorMessage: error.message,
     };
   }
 }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks/libs/libAuthenticationUtils.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks/libs/libAuthenticationUtils.js
index 2e3a31461..74870d579 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks/libs/libAuthenticationUtils.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks/libs/libAuthenticationUtils.js
@@ -72,12 +72,8 @@ function calculateHmacSignature(request) {
       macSHA256.digest(payload, hmacKey),
     );
     return merchantSignature;
-  } catch (e) {
-    AdyenLogs.fatal_log(
-      `Cannot calculate HMAC signature: ${e.toString()} in ${e.fileName}:${
-        e.lineNumber
-      }`,
-    );
+  } catch (error) {
+    AdyenLogs.fatal_log('Cannot calculate HMAC signature', error);
     return { error: true };
   }
 }
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/begin.js b/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/begin.js
index 40694dcc5..3928b09b0 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/begin.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/begin.js
@@ -36,7 +36,7 @@ function restoreBasket(cachedOrderNumber, cachedOrderToken) {
       return true;
     }
   } catch (error) {
-    AdyenLogs.error_log(`Failed to restore cart. error: ${error}`);
+    AdyenLogs.error_log('Failed to restore cart', error);
   }
   return false;
 }