diff --git a/bin/plug_ins/Auto_reboot/cp_master b/bin/plug_ins/Auto_reboot/cp_master
index e28d773..b7aad55 100755
--- a/bin/plug_ins/Auto_reboot/cp_master
+++ b/bin/plug_ins/Auto_reboot/cp_master
@@ -81,7 +81,7 @@
 
     get_plug_vars()
 
-    valid_value(AUTOBOOT_OPENBMC_HOST, ["", None])
+    valid_value(AUTOBOOT_OPENBMC_HOST)
     global AUTO_REBOOT_DISABLE
     if pgm_name == "cp_cleanup":
         AUTO_REBOOT_DISABLE = 0
diff --git a/bin/plug_ins/Stop/cp_stop_check b/bin/plug_ins/Stop/cp_stop_check
index acaddfe..713bd96 100755
--- a/bin/plug_ins/Stop/cp_stop_check
+++ b/bin/plug_ins/Stop/cp_stop_check
@@ -21,6 +21,9 @@
 # Restore sys.path[0].
 sys.path.insert(0, save_path_0)
 
+# Set exit_on_error for gen_valid functions.
+set_exit_on_error(True)
+
 # Initialize.
 STOP_REST_FAIL = ''
 STOP_COMMAND = ''
@@ -95,8 +98,7 @@
 
     get_plug_vars()
 
-    if not valid_value(AUTOBOOT_OPENBMC_HOST, ["", None]):
-        return False
+    valid_value(AUTOBOOT_OPENBMC_HOST)
 
     gen_post_validation(exit_function, signal_handler)