diff --git a/bin/plug_ins/Stop/cp_stop_check b/bin/plug_ins/Stop/cp_stop_check
index 9c7cca6..acaddfe 100755
--- a/bin/plug_ins/Stop/cp_stop_check
+++ b/bin/plug_ins/Stop/cp_stop_check
@@ -183,10 +183,6 @@
 
     print_plug_in_header()
 
-    rest_fail()
-
-    esel_stop_check()
-
     if STOP_COMMAND.upper() == "FAIL":
         if AUTOBOOT_BOOT_SUCCESS == "0":
             print_timen("The caller wishes to stop after each boot failure.")
@@ -200,6 +196,10 @@
             print_timen("The caller wishes to stop test execution.")
             stop_check()
 
+    rest_fail()
+
+    esel_stop_check()
+
     qprint_timen("The caller does not wish to stop the test run.")
     return True