diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f643add3401f219bf8d6d11e8fbb67b1ee4f173..f0cb125fd9dd31c2568ffe7373f9d8e9d1218c46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -965,6 +965,7 @@ coverage-test-on-main-scheduled:
   - sed -i "s/IVAS FORMAT/IVAS $in_format to $out_format/g" ${public_dir}/index.html
   # do separately here to avoid overwrite complaints by mv
   - mv -f ci/complexity_measurements/style.css ${public_dir}/
+  - ls $public_dir
 
 .complexity-template:
   extends:
diff --git a/ci/collect_artifacts.py b/ci/collect_artifacts.py
index d3228ba2e85e224fa7fb9fdc6415036b6c77f982..6cd0a77ed7ab9b3337335e22a94b9b3c35e7c51b 100755
--- a/ci/collect_artifacts.py
+++ b/ci/collect_artifacts.py
@@ -62,6 +62,9 @@ def collect_for_sanitizer_test(file):
     )
     files_to_archive = find_failed_files_for_sanitizer_test(console_log, "logs")
 
+    print("files_to_archive_noPLC:", files_to_archive_noPLC)
+    print("files_to_archive:", files_to_archive)
+
     log_folder = pathlib.Path("./LOGS_PLC")
     log_folder.mkdir()
     for test in files_to_archive.keys():
diff --git a/scripts/pyivastest/IvasScriptsCommon.py b/scripts/pyivastest/IvasScriptsCommon.py
index 45631566e980bf7ca208583e6ce94b072a454671..46e6a2f4a83b285a8e0c9db851c11c3691dc538c 100644
--- a/scripts/pyivastest/IvasScriptsCommon.py
+++ b/scripts/pyivastest/IvasScriptsCommon.py
@@ -544,12 +544,18 @@ def runner_setup(runner, args):
         runner.limit_duration = True
         runner.max_duration = args["limit_duration"]
 
+    if "fer_file" in args.keys() or "ber_file" in args.keys():
+        # assert that the eid-xor tool is there
+        eid_xor_path = os.path.join(runner.config["utilPath"], "eid-xor")
+        if not os.path.isfile(eid_xor_path):
+            raise FileNotFoundError(f"Could not find {eid_xor_path} (needed for error pattern insertion)")
+
     if args["fer_file"]:
         fer_suffix = "fer_{}".format(
             "_".join(os.path.basename(args["fer_file"]).split("."))
         )
         fer_cmd = [
-            os.path.join(runner.config["utilPath"], "eid-xor"),
+            eid_xor_path,
             "-vbr",
             "-fer",
             "{in_file}",
@@ -564,7 +570,7 @@ def runner_setup(runner, args):
             "_".join(os.path.basename(args["ber_file"]).split("."))
         )
         ber_cmd = [
-            os.path.join(runner.config["utilPath"], "eid-xor"),
+            eid_xor_path,
             "-vbr",
             "-ber",
             "{in_file}",
@@ -634,12 +640,19 @@ def runner_setup(runner, args):
 
 def analyzer_setup(analyzer, args):
     bs_proc_chain = {}
+
+    if "fer_file" in args.keys() or "ber_file" in args.keys():
+        # assert that the eid-xor tool is there
+        eid_xor_path = os.path.join(analyzer.config["utilPath"], "eid-xor")
+        if not os.path.isfile(eid_xor_path):
+            raise FileNotFoundError(f"Could not find {eid_xor_path} (needed for error pattern insertion)")
+
     if args["fer_file"]:
         fer_suffix = "fer_{}".format(
             "_".join(os.path.basename(args["fer_file"]).split("."))
         )
         fer_cmd = [
-            os.path.join(analyzer.config["utilPath"], "eid-xor"),
+            eid_xor_path,
             "-vbr",
             "-fer",
             "{in_file}",
@@ -654,7 +667,7 @@ def analyzer_setup(analyzer, args):
             "_".join(os.path.basename(args["ber_file"]).split("."))
         )
         ber_cmd = [
-            os.path.join(analyzer.config["utilPath"], "eid-xor"),
+            eid_xor_path,
             "-vbr",
             "-ber",
             "{in_file}",