diff --git a/tools/etcpmon/build.bat b/tools/etcpmon/build.bat
index 24e6912e..0a6fc90e 100644
--- a/tools/etcpmon/build.bat
+++ b/tools/etcpmon/build.bat
@@ -32,7 +32,7 @@ set "CURRENT_DIR=%CD%"
 
 REM Launch MSYS2 UCRT64 shell and run build script with real-time logging
 REM Using tee to show output in console AND save to log
-call "%MSYS2_PATH%\msys2_shell.cmd" -ucrt64 -here -defterm -no-start -c "cd tools/etcpmon && bash build.sh 2>&1 | tee build.log"
+call "%MSYS2_PATH%\msys2_shell.cmd" -ucrt64 -here -defterm -no-start -c "cd \"%CURRENT_DIR%/tools/etcpmon\" && bash build.sh 2>&1"
 
 set BUILD_RESULT=%ERRORLEVEL%
 
diff --git a/tools/etcpmon/build.sh b/tools/etcpmon/build.sh
index 45d88ffa..abfa96aa 100644
--- a/tools/etcpmon/build.sh
+++ b/tools/etcpmon/build.sh
@@ -3,7 +3,7 @@
 # Usage: ./build.sh
 # Log is automatically saved to build.log
 
-set -e
+set -eo pipefail
 
 # Capture all output to log file
 LOG_FILE="build.log"
diff --git a/tools/etcpmon/etcpmon_gui.c b/tools/etcpmon/etcpmon_gui.c
index 274fa1c0..d53a4d0b 100644
--- a/tools/etcpmon/etcpmon_gui.c
+++ b/tools/etcpmon/etcpmon_gui.c
@@ -1220,7 +1220,6 @@ static const char* nat_type_to_string(uint8_t nat_type) {
         default:                      return "?";
     }
 }
-}
 
 void etcpmon_gui_update_socket_list(struct etcpmon_app* app,
                                      struct etcpmon_socket_info* list,