diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9fc90d8c2c2c604fdb9801457a17a208d442d2b7..0dd2a4aeb10b02148cbb508b994d540e5c1279fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -352,6 +352,13 @@ build-codec-instrumented-linux:
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
     - ./scripts/prepare_instrumentation.sh
     - make -j -C scripts/c-code_instrument
+  artifacts:
+    when: always
+    access: all
+    expire_in: "30 days"
+    paths:
+      - wmc_tool_output.txt
+
 
 # make sure that the codec builds with msan, asan and usan
 build-codec-sanitizers-linux:
diff --git a/scripts/prepare_instrumentation.sh b/scripts/prepare_instrumentation.sh
index c52c5658466b3d0f4d7c6f7a07d8dfd2faca6d70..52549c77898b75a3a1a028eb4599f518a8aa92e2 100755
--- a/scripts/prepare_instrumentation.sh
+++ b/scripts/prepare_instrumentation.sh
@@ -227,6 +227,8 @@ find $targetdir -name "*.[ch]" -exec sed -i.bak -e "s/\(0x[0-9a-fA-F]*\)UL/\(\(u
 
 # run wmc_tool, exit if the command fails
 set -e
+touch wmc_tool_output.txt
+trap 'echo "Error calling WMC tool: $?"; cat wmc_tool_output.txt' ERR
 "$scriptdir/tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/encoder.c" "$targetdir/lib_enc/*.c" "$targetdir/lib_com/*.c" >>wmc_tool_output.txt 2>&1
 "$scriptdir/tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" >>wmc_tool_output.txt 2>&1
 for bak_file in $targetdir/lib_rend/*.bak; do mv "$bak_file" "${bak_file%.*}"; done # restore fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool
@@ -241,6 +243,7 @@ else
     # ISAR post rend
     "$scriptdir/tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/isar_post_rend.c" "$targetdir/lib_isar/*.c" "$targetdir/lib_lc3plus/*.c" "$lc3plus_fftdir" >>wmc_tool_output.txt 2>&1
 fi
+trap - ERR
 set +e
 
 # automatically enable #define WMOPS in options.h
diff --git a/scripts/tools/Darwin/wmc_tool b/scripts/tools/Darwin/wmc_tool
index 855bc1a4a77ee747cc9e7b754bd1598ad1b43b7d..7f6c185f4bdb89bfe622fa4251233ca042d66abc 100755
Binary files a/scripts/tools/Darwin/wmc_tool and b/scripts/tools/Darwin/wmc_tool differ
diff --git a/scripts/tools/Linux/wmc_tool b/scripts/tools/Linux/wmc_tool
index 5b58206b9ef08e2c8920817a0591f1e4ae89f2c9..5a9f27c86daba0b795aad9b7881ef2718d3e333d 100755
Binary files a/scripts/tools/Linux/wmc_tool and b/scripts/tools/Linux/wmc_tool differ
diff --git a/scripts/tools/Win32/wmc_tool.exe b/scripts/tools/Win32/wmc_tool.exe
index 87414242c34379b4a2776389e5fba5ed1cbcb649..c5a4aabe7242a9b30d591c146124028942bc0a95 100755
--- a/scripts/tools/Win32/wmc_tool.exe
+++ b/scripts/tools/Win32/wmc_tool.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69b3382c94f1c83864d216b7e9b4c102c0266d29bf27cb09da2b1c56e106292b
-size 276480
+oid sha256:a029f90c6f95aa75773466795ea2ae16847799d7feca408318ecd1265f517a41
+size 275968