diff --git a/Tools/jmavsim_run.sh b/Tools/jmavsim_run.sh
index 704833d17a..c158fd373f 100755
--- a/Tools/jmavsim_run.sh
+++ b/Tools/jmavsim_run.sh
@@ -1,4 +1,6 @@
-#! /bin/bash
+#!/usr/bin/env bash
+
+set -e
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$SCRIPT_DIR/jMAVSim"