diff --git a/bin/plug_ins/Auto_reboot/cp_master b/bin/plug_ins/Auto_reboot/cp_master
index 36d40f2..e28d773 100755
--- a/bin/plug_ins/Auto_reboot/cp_master
+++ b/bin/plug_ins/Auto_reboot/cp_master
@@ -100,7 +100,10 @@
 
     qprint_pgm_header()
 
-    dprint_plug_vars()
+    print_plug_in_header()
+
+    if pgm_name == "cp_setup" or pgm_name == "cp_cleanup":
+        exit_not_master()
 
     init_robot_out_parms(get_plug_in_package_name() + "." + pgm_name + ".")
 
diff --git a/bin/plug_ins/Stop/cp_stop_check b/bin/plug_ins/Stop/cp_stop_check
index 11527c9..9c7cca6 100755
--- a/bin/plug_ins/Stop/cp_stop_check
+++ b/bin/plug_ins/Stop/cp_stop_check
@@ -181,7 +181,7 @@
     if not debug:
         qprint_vars(STOP_REST_FAIL, STOP_COMMAND, AUTOBOOT_BOOT_SUCCESS)
 
-    dprint_plug_vars()
+    print_plug_in_header()
 
     rest_fail()