diff --git a/src/slurmctld/backup.c b/src/slurmctld/backup.c
index 7a7ab7b95e578d6236f31ea16db95bbc51e00146..ece27daa44fa318dbe413886b1de30bf01bf7f68 100644
--- a/src/slurmctld/backup.c
+++ b/src/slurmctld/backup.c
@@ -357,6 +357,7 @@ static int _background_process_msg(slurm_msg_t * msg)
 		} else if (super_user && 
 			   (msg->msg_type == REQUEST_CONTROL)) {
 			debug3("Ignoring RPC: REQUEST_CONTROL");
+			error_code = ESLURM_DISABLED;
 		} else {
 			error("Invalid RPC received %d from uid %u", 
 			      msg->msg_type, uid);
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index cc8326ccce1923307fe1ad2b50b8a60394f8f9dd..8ae6da3a15f22493c0209ce9f7cc7db43560c842 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -1051,11 +1051,14 @@ static int _shutdown_backup_controller(int wait_time)
 		error("_shutdown_backup_controller:send/recv: %m, %s", TIME_STR);
 		return SLURM_ERROR;
 	}
-	if (rc) {
+	if (rc == ESLURM_DISABLED)
+		debug("backup controller responding");
+	else if (rc == 0)
+		debug("backup controller has relinquished control");
+	else {
 		error("_shutdown_backup_controller: %s", slurm_strerror(rc));
 		return SLURM_ERROR;
 	}
-	debug("backup controller has relinquished control");
 
 	/* FIXME: Ideally the REQUEST_CONTROL RPC does not return until all   
 	 * other activity has ceased and the state has been saved. That is