diff --git a/ci/scripts/run_benchmarks.sh b/ci/scripts/run_benchmarks.sh
index 4d32eff..580cdba 100755
--- a/ci/scripts/run_benchmarks.sh
+++ b/ci/scripts/run_benchmarks.sh
@@ -71,10 +71,6 @@
     rm ${input}
   fi
 
-  if [[ ${i} != 5 ]]; then
-    set +e
-  fi
-
   if [ -z "${BASELINE_VERSION}" ]; then
     BASELINE_OPTION="-B ${BASELINE_BRANCH} -R ${BASELINE_REPO}"
     METADATA_BASELINE="'benchmark_branch':'${BASELINE_BRANCH}'"
@@ -85,6 +81,11 @@
 
   ./run_on_cluster.sh -t ${CLUSTER_TAG} -- pkill -9 java
   ./run_on_cluster.sh -t ${CLUSTER_TAG} -- rm /home/geode/locator10334view.dat;
+
+  if [[ ${i} != 5 ]]; then
+    set +e
+  fi
+
   ./run_against_baseline.sh -t ${CLUSTER_TAG} -b ${GEODE_SHA} -r ${GEODE_REPO} -p ${BENCHMARKS_REPO} ${BASELINE_OPTION} -e ${BENCHMARKS_BRANCH} -o ${RESULTS_DIR} -m "'source':'geode-ci',${METADATA_BASELINE},'baseline_branch':'${BASELINE_BRANCH}','geode_branch':'${GEODE_SHA}'" --ci -- ${FLAGS} ${TEST_OPTIONS}
 
   if [[ $? -eq 0 ]]; then