diff --git a/scripts/support/m2isar_perf_run_wrapper.sh b/scripts/support/m2isar_perf_run_wrapper.sh
index 4f4b525..37b0582 100755
--- a/scripts/support/m2isar_perf_run_wrapper.sh
+++ b/scripts/support/m2isar_perf_run_wrapper.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+set -e
 
 exe="python3 ${PSW_M2ISAR_PERF}/m2isar_perf/run.py"
 
diff --git a/scripts/support/m2isar_run_wrapper.sh b/scripts/support/m2isar_run_wrapper.sh
index 371ada4..4f419b1 100755
--- a/scripts/support/m2isar_run_wrapper.sh
+++ b/scripts/support/m2isar_run_wrapper.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 source ${PSW_M2ISAR}/venv/bin/activate
 echo $*
 $*
diff --git a/scripts/support/run_helper.py b/scripts/support/run_helper.py
index 536a730..56370d7 100755
--- a/scripts/support/run_helper.py
+++ b/scripts/support/run_helper.py
@@ -2,6 +2,7 @@
 import argparse
 import os
 import sys
+from pathlib import Path
 
 # Read input arguments
 argParser = argparse.ArgumentParser()
@@ -28,6 +29,8 @@
          targetSW = os.environ.get(targetSW_prefix + "FLOAT")
       else:
          raise RuntimeError(f"Target-SW float is currently not supported for {args.core.upper()}")
+   elif Path(args.targetSW).is_file():
+      targetSW = args.targetSW
    else:
       targetSW_failed = True
 elif len(split:=args.targetSW.split(":")) == 2: