diff --git a/priv/templates/simplenode.runner b/priv/templates/simplenode.runner
index 01df613..a605513 100755
--- a/priv/templates/simplenode.runner
+++ b/priv/templates/simplenode.runner
@@ -304,6 +304,10 @@ case "$1" in
 
         shift
         $NODETOOL eval "$1"
+        ES_EVAL=$?
+        if [ "$ES_EVAL" -ne 0 ]; then
+            exit $ES_EVAL
+        fi
         ;;
 
     remote_console)
diff --git a/test/upgrade_project/rel/files/dummy b/test/upgrade_project/rel/files/dummy
index 9ea6b3d..67fb2da 100755
--- a/test/upgrade_project/rel/files/dummy
+++ b/test/upgrade_project/rel/files/dummy
@@ -245,6 +245,10 @@ case "$1" in
 
         shift
         $NODETOOL eval "$1"
+        ES_EVAL=$?
+        if [ "$ES_EVAL" -ne 0 ]; then
+            exit $ES_EVAL
+        fi
         ;;
 
     remote_console)