diff --git a/adyencheckoutaddonspa/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/errorhandler/ErrorHandler.ts b/adyencheckoutaddonspa/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/errorhandler/ErrorHandler.ts
index 9fd49b7e..c2dfc623 100644
--- a/adyencheckoutaddonspa/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/errorhandler/ErrorHandler.ts
+++ b/adyencheckoutaddonspa/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/errorhandler/ErrorHandler.ts
@@ -8,13 +8,10 @@ export class ErrorHandler {
 
     public static handleError(error?: AxiosError<ErrorResponse>) {
         let errorResponseData
-        if (!error) {
+        if (!error || !error.response || !error.response.data || isEmpty(error.response.data.errorCode)) {
             errorResponseData = createDefaultResponseData()
         } else {
             errorResponseData = error.response.data;
-            if (!errorResponseData || isEmpty(errorResponseData.errorCode)) {
-                errorResponseData = createDefaultResponseData()
-            }
         }
         store.dispatch({type: "notifications/addNotification", payload: createError(errorResponseData)})
     }