From 7519fc32a61bb1077a35e4e8565e2a39fcfebe4c Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Tue, 24 Mar 2026 22:21:21 +0100
Subject: [PATCH] refactor: use try/catch instead of .catch() for
 stopMessageSequence error handling

---
 src/charging-station/ChargingStation.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index c856ae29..605f77fc 100644
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -1153,13 +1153,15 @@ export class ChargingStation extends EventEmitter {
       if (!this.stopping) {
         this.stopping = true
         try {
-          await promiseWithTimeout(
-            this.stopMessageSequence(reason, stopTransactions),
-            Constants.STOP_MESSAGE_SEQUENCE_TIMEOUT,
-            `Timeout ${formatDurationMilliSeconds(Constants.STOP_MESSAGE_SEQUENCE_TIMEOUT)} reached at stopping message sequence`
-          ).catch((error: unknown) => {
+          try {
+            await promiseWithTimeout(
+              this.stopMessageSequence(reason, stopTransactions),
+              Constants.STOP_MESSAGE_SEQUENCE_TIMEOUT,
+              `Timeout ${formatDurationMilliSeconds(Constants.STOP_MESSAGE_SEQUENCE_TIMEOUT)} reached at stopping message sequence`
+            )
+          } catch (error: unknown) {
             logger.error(`${this.logPrefix()} Error while stopping message sequence:`, error)
-          })
+          }
           this.ocppIncomingRequestService.stop(this)
           this.closeWSConnection()
           if (this.stationInfo?.enableStatistics === true) {
-- 
2.43.0