diff --git a/opencart2.0.x-2.2.x/upload/catalog/controller/payment/xendit.php b/opencart2.0.x-2.2.x/upload/catalog/controller/payment/xendit.php
index b19352a..684c3cc 100644
--- a/opencart2.0.x-2.2.x/upload/catalog/controller/payment/xendit.php
+++ b/opencart2.0.x-2.2.x/upload/catalog/controller/payment/xendit.php
@@ -59,9 +59,10 @@ public function process_payment()
         try {
             $response = Xendit::request($request_url, Xendit::METHOD_POST, $request_payload, $request_options);
 
-            if(array_key_exists("error_code", $response)) {
-                $json = $response;
-            } else {
+            if (isset($response['error_code'])) {
+                $json['error'] = $response['message'];
+            } 
+            else {
                 $this->model_payment_xendit->addOrder($order, $response, $this->config->get('xendit_environment'));
                 $message = 'Invoice ID: ' . $response['id'] . '. Redirecting..';
                 $this->model_checkout_order->addOrderHistory(
diff --git a/opencart2.0.x-2.2.x/upload/catalog/controller/payment/xenditcc.php b/opencart2.0.x-2.2.x/upload/catalog/controller/payment/xenditcc.php
index a3e3873..3eca03a 100644
--- a/opencart2.0.x-2.2.x/upload/catalog/controller/payment/xenditcc.php
+++ b/opencart2.0.x-2.2.x/upload/catalog/controller/payment/xenditcc.php
@@ -54,18 +54,19 @@ public function process_payment() {
             $response = Xendit::request($request_url, Xendit::METHOD_POST, $request_payload, $request_options);
 
             if (isset($response['error_code'])) {
-                throw new Exception('Failed to authenticate, please try again');
+                $json['error'] = 'Failed to authenticate, please try again.';
+            }
+            else {
+                $message = 'Authentication ID: ' . $response['id'] . '. Authenticating..';
+                $this->model_checkout_order->addOrderHistory(
+                    $order_id,
+                    1,
+                    $message,
+                    false
+                );
+
+                $json['redirect'] = $response['redirect']['url'];
             }
-
-            $message = 'Authentication ID: ' . $response['id'] . '. Authenticating..';
-            $this->model_checkout_order->addOrderHistory(
-                $order_id,
-                1,
-                $message,
-                false
-            );
-
-            $json['redirect'] = $response['redirect']['url'];
 
             $this->response->addHeader('Content-Type: application/json');
             $this->response->setOutput(json_encode($json));
diff --git a/opencart2.0.x-2.2.x/upload/catalog/view/theme/default/template/payment/xendit.tpl b/opencart2.0.x-2.2.x/upload/catalog/view/theme/default/template/payment/xendit.tpl
index f5a0bb4..1eed0da 100644
--- a/opencart2.0.x-2.2.x/upload/catalog/view/theme/default/template/payment/xendit.tpl
+++ b/opencart2.0.x-2.2.x/upload/catalog/view/theme/default/template/payment/xendit.tpl
@@ -39,12 +39,11 @@
                 $('#button-confirm').button('reset');
             },
             success: function(json) {
-                if(json['error_code']) {
-                    alert(json['message']);
-                } else {
-                    if (json['redirect']) {
-                        location = json['redirect'] + '#' + $('#invoice-hash').val();
-                    }
+                if (json['error']) {
+                    alert(json['error']);
+                }
+                if (json['redirect']) {
+                    location = json['redirect'] + '#' + $('#invoice-hash').val();
                 }
             },
             error: function(xhr, ajaxOptions, thrownError) {
diff --git a/opencart2.0.x-2.2.x/upload/catalog/view/theme/default/template/payment/xenditcc.tpl b/opencart2.0.x-2.2.x/upload/catalog/view/theme/default/template/payment/xenditcc.tpl
index 76755d7..35b9f2f 100644
--- a/opencart2.0.x-2.2.x/upload/catalog/view/theme/default/template/payment/xenditcc.tpl
+++ b/opencart2.0.x-2.2.x/upload/catalog/view/theme/default/template/payment/xenditcc.tpl
@@ -86,7 +86,7 @@
 </div>
 
 <script src="https://js.xendit.co/v1/xendit.min.js"></script>
-<script type="text/javascript"><!--
+<script type="text/javascript">
     var buttonConfirm = $('#button-confirm');
     buttonConfirm.on('click', function() {
         buttonConfirm.button('loading');
@@ -129,6 +129,9 @@
                     $('#button-confirm').button('reset');
                 },
                 success: function(json) {
+                    if (json['error']) {
+                        alert(json['error']);
+                    }
                     if (json['redirect']) {
                         location = json['redirect'];
                     }
@@ -139,7 +142,7 @@
             });
         });
     });
-    //--></script>
+</script>
 
 <style>
     .test_instructions {
diff --git a/opencart2.3.x/upload/catalog/controller/extension/payment/xendit.php b/opencart2.3.x/upload/catalog/controller/extension/payment/xendit.php
index 52408ad..44f862b 100644
--- a/opencart2.3.x/upload/catalog/controller/extension/payment/xendit.php
+++ b/opencart2.3.x/upload/catalog/controller/extension/payment/xendit.php
@@ -50,16 +50,21 @@ public function process_payment() {
         try {
             $response = Xendit::request($request_url, Xendit::METHOD_POST, $request_payload, $request_options);
 
-            $this->model_extension_payment_xendit->addOrder($order, $response, $this->config->get('xendit_environment'));
-            $message = 'Invoice ID: ' . $response['id'] . '. Redirecting..';
-            $this->model_checkout_order->addOrderHistory(
-                $order_id,
-                1,
-                $message,
-                false
-            );
-
-            $json['redirect'] = $response['invoice_url'];
+            if (isset($response['error_code'])) {
+                $json['error'] = $response['message'];
+            }
+            else {
+                $this->model_extension_payment_xendit->addOrder($order, $response, $this->config->get('xendit_environment'));
+                $message = 'Invoice ID: ' . $response['id'] . '. Redirecting..';
+                $this->model_checkout_order->addOrderHistory(
+                    $order_id,
+                    1,
+                    $message,
+                    false
+                );
+
+                $json['redirect'] = $response['invoice_url'];
+            }
 
             $this->response->addHeader('Content-Type: application/json');
             $this->response->setOutput(json_encode($json));
diff --git a/opencart2.3.x/upload/catalog/controller/extension/payment/xenditcc.php b/opencart2.3.x/upload/catalog/controller/extension/payment/xenditcc.php
index e1484f8..ce73a7f 100644
--- a/opencart2.3.x/upload/catalog/controller/extension/payment/xenditcc.php
+++ b/opencart2.3.x/upload/catalog/controller/extension/payment/xenditcc.php
@@ -50,18 +50,19 @@ public function process_payment() {
             $response = Xendit::request($request_url, Xendit::METHOD_POST, $request_payload, $request_options);
 
             if (isset($response['error_code'])) {
-                throw new Exception('Failed to authenticate, please try again');
+                $json['error'] = 'Failed to authenticate, please try again.';
+            }
+            else {
+                $message = 'Authentication ID: ' . $response['id'] . '. Authenticating..';
+                $this->model_checkout_order->addOrderHistory(
+                    $order_id,
+                    1,
+                    $message,
+                    false
+                );
+
+                $json['redirect'] = $response['redirect']['url'];
             }
-
-            $message = 'Authentication ID: ' . $response['id'] . '. Authenticating..';
-            $this->model_checkout_order->addOrderHistory(
-                $order_id,
-                1,
-                $message,
-                false
-            );
-
-            $json['redirect'] = $response['redirect']['url'];
 
             $this->response->addHeader('Content-Type: application/json');
             $this->response->setOutput(json_encode($json));
diff --git a/opencart2.3.x/upload/catalog/view/theme/default/template/extension/payment/xendit.tpl b/opencart2.3.x/upload/catalog/view/theme/default/template/extension/payment/xendit.tpl
index e6943af..73db95c 100644
--- a/opencart2.3.x/upload/catalog/view/theme/default/template/extension/payment/xendit.tpl
+++ b/opencart2.3.x/upload/catalog/view/theme/default/template/extension/payment/xendit.tpl
@@ -27,7 +27,7 @@
         />
     </div>
 </div>
-<script type="text/javascript"><!--
+<script type="text/javascript">
     $('#button-confirm').on('click', function() {
         $.ajax({
             url: 'index.php?route=extension/payment/xendit/process_payment',
@@ -39,6 +39,9 @@
                 $('#button-confirm').button('reset');
             },
             success: function(json) {
+                if (json['error']) {
+                    alert(json['error']);
+                }
                 if (json['redirect']) {
                     location = json['redirect'] + '#' + $('#invoice-hash').val();
                 }
@@ -48,7 +51,7 @@
             }
         });
     });
-    //--></script>
+    </script>
 
 <style>
     .test_instructions {
diff --git a/opencart2.3.x/upload/catalog/view/theme/default/template/extension/payment/xenditcc.tpl b/opencart2.3.x/upload/catalog/view/theme/default/template/extension/payment/xenditcc.tpl
index 025cbea..28d42e2 100644
--- a/opencart2.3.x/upload/catalog/view/theme/default/template/extension/payment/xenditcc.tpl
+++ b/opencart2.3.x/upload/catalog/view/theme/default/template/extension/payment/xenditcc.tpl
@@ -109,7 +109,6 @@
                 buttonConfirm.button('reset');
 
                 alert('Tokenization error. Error code:' + err.error_code);
-
                 return;
             }
 
@@ -129,6 +128,9 @@
                     $('#button-confirm').button('reset');
                 },
                 success: function(json) {
+                    if (json['error']) {
+                        alert(json['error']);
+                    }
                     if (json['redirect']) {
                         location = json['redirect'];
                     }
diff --git a/opencart3.0.x/upload/catalog/controller/extension/payment/xendit.php b/opencart3.0.x/upload/catalog/controller/extension/payment/xendit.php
index 4b89946..53a7116 100644
--- a/opencart3.0.x/upload/catalog/controller/extension/payment/xendit.php
+++ b/opencart3.0.x/upload/catalog/controller/extension/payment/xendit.php
@@ -50,16 +50,21 @@ public function process_payment() {
         try {
             $response = Xendit::request($request_url, Xendit::METHOD_POST, $request_payload, $request_options);
 
-            $this->model_extension_payment_xendit->addOrder($order, $response, $this->config->get('payment_xendit_environment'));
-            $message = 'Invoice ID: ' . $response['id'] . '. Redirecting..';
-            $this->model_checkout_order->addOrderHistory(
-                $order_id,
-                1,
-                $message,
-                false
-            );
-
-            $json['redirect'] = $response['invoice_url'];
+            if (isset($response['error_code'])) {
+                $json['error'] = $response['message'];
+            }
+            else {
+                $this->model_extension_payment_xendit->addOrder($order, $response, $this->config->get('payment_xendit_environment'));
+                $message = 'Invoice ID: ' . $response['id'] . '. Redirecting..';
+                $this->model_checkout_order->addOrderHistory(
+                    $order_id,
+                    1,
+                    $message,
+                    false
+                );
+
+                $json['redirect'] = $response['invoice_url'];
+            }
 
             $this->response->addHeader('Content-Type: application/json');
             $this->response->setOutput(json_encode($json));
diff --git a/opencart3.0.x/upload/catalog/controller/extension/payment/xenditcc.php b/opencart3.0.x/upload/catalog/controller/extension/payment/xenditcc.php
index c452dbc..c2cd96a 100644
--- a/opencart3.0.x/upload/catalog/controller/extension/payment/xenditcc.php
+++ b/opencart3.0.x/upload/catalog/controller/extension/payment/xenditcc.php
@@ -48,19 +48,20 @@ public function process_payment() {
             $response = Xendit::request($request_url, Xendit::METHOD_POST, $request_payload, $request_options);
 
             if (isset($response['error_code'])) {
-                throw new Exception('Failed to authenticate, please try again');
+                $json['error'] = 'Failed to authenticate, please try again.';
             }
-
-            $message = 'Authentication ID: ' . $response['id'] . '. Authenticating..';
-            $this->model_checkout_order->addOrderHistory(
-                $order_id,
-                1,
-                $message,
-                false
-            );
-
-            $json['redirect'] = $response['redirect']['url'];
-
+            else {
+                $message = 'Authentication ID: ' . $response['id'] . '. Authenticating..';
+                $this->model_checkout_order->addOrderHistory(
+                    $order_id,
+                    1,
+                    $message,
+                    false
+                );
+
+                $json['redirect'] = $response['redirect']['url'];
+            }
+            
             $this->response->addHeader('Content-Type: application/json');
             $this->response->setOutput(json_encode($json));
         } catch (Exception $e) {
diff --git a/opencart3.0.x/upload/catalog/view/theme/default/template/extension/payment/xendit.twig b/opencart3.0.x/upload/catalog/view/theme/default/template/extension/payment/xendit.twig
index fe6b6f0..2939f6d 100644
--- a/opencart3.0.x/upload/catalog/view/theme/default/template/extension/payment/xendit.twig
+++ b/opencart3.0.x/upload/catalog/view/theme/default/template/extension/payment/xendit.twig
@@ -27,7 +27,7 @@
         />
     </div>
 </div>
-<script type="text/javascript"><!--
+<script type="text/javascript">
     $('#button-confirm').on('click', function() {
         $.ajax({
             url: 'index.php?route=extension/payment/xendit/process_payment',
@@ -39,6 +39,9 @@
                 $('#button-confirm').button('reset');
             },
             success: function(json) {
+                if (json['error']) {
+                    alert(json['error']);
+                }
                 if (json['redirect']) {
                     location = json['redirect'] + '#' + $('#invoice-hash').val();
                 }
@@ -48,7 +51,7 @@
             }
         });
     });
-    //--></script>
+</script>
 
 <style>
     .test_instructions {
diff --git a/opencart3.0.x/upload/catalog/view/theme/default/template/extension/payment/xenditcc.twig b/opencart3.0.x/upload/catalog/view/theme/default/template/extension/payment/xenditcc.twig
index 102b441..7174f8e 100644
--- a/opencart3.0.x/upload/catalog/view/theme/default/template/extension/payment/xenditcc.twig
+++ b/opencart3.0.x/upload/catalog/view/theme/default/template/extension/payment/xenditcc.twig
@@ -86,7 +86,7 @@
 </div>
 
 <script src="https://js.xendit.co/v1/xendit.min.js"></script>
-<script type="text/javascript"><!--
+<script type="text/javascript">
     var buttonConfirm = $('#button-confirm');
     buttonConfirm.on('click', function() {
         buttonConfirm.button('loading');
@@ -129,6 +129,9 @@
                     $('#button-confirm').button('reset');
                 },
                 success: function(json) {
+                    if (json['error']) {
+                        alert(json['error']);
+                    }
                     if (json['redirect']) {
                         location = json['redirect'];
                     }
@@ -139,7 +142,7 @@
             });
         });
     });
-    //--></script>
+</script>
 
 <style>
     .test_instructions {