From 78fd93b72a3adc71c3b16a979039b6f637750d3e Mon Sep 17 00:00:00 2001
From: Sander Declerck <sander@sdsoftware.be>
Date: Fri, 31 Oct 2025 11:41:39 +0100
Subject: [PATCH] End clientsocket without 502 in case of proxySocket error

---
 .../safe-chain/src/registryProxy/tunnelRequestHandler.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/safe-chain/src/registryProxy/tunnelRequestHandler.js b/packages/safe-chain/src/registryProxy/tunnelRequestHandler.js
index ceaf91d..5c764f5 100644
--- a/packages/safe-chain/src/registryProxy/tunnelRequestHandler.js
+++ b/packages/safe-chain/src/registryProxy/tunnelRequestHandler.js
@@ -102,13 +102,16 @@ function tunnelRequestViaProxy(req, clientSocket, head, proxyUrl) {
           proxy.port || 8080
         } - ${err.message}`
       );
+      if (clientSocket.writable) {
+        clientSocket.end("HTTP/1.1 502 Bad Gateway\r\n\r\n");
+      }
     } else {
       ui.writeError(
         `Safe-chain: proxy socket error after connection - ${err.message}`
       );
-    }
-    if (clientSocket.writable) {
-      clientSocket.end("HTTP/1.1 502 Bad Gateway\r\n\r\n");
+      if (clientSocket.writable) {
+        clientSocket.end();
+      }
     }
   });