diff --git a/src/slurmctld/agent.c b/src/slurmctld/agent.c
index 550d715cc8ff1c5bf4a464cdec77f97982b7156c..405cb1c02a4b21f0c51537a06806ac43c2c45fcf 100644
--- a/src/slurmctld/agent.c
+++ b/src/slurmctld/agent.c
@@ -573,9 +573,10 @@ static void *_thread_per_node_rpc(void *args)
 		      thread_ptr->node_name);
 		thread_state = DSH_FAILED;
 		break;
-	case ESLURM_INVALID_JOB_ID: /* Not indicative of a real error */
-		debug2("agent processed RPC to node %s, error %s",
-		       thread_ptr->node_name, "Invalid Job Id");
+	case ESLURM_INVALID_JOB_ID:  /* Not indicative of a real error */
+	case ESLURMD_JOB_NOTRUNNING: /* Not indicative of a real error */
+		debug2("agent processed RPC to node %s: %s",
+		       thread_ptr->node_name, slurm_strerror(rc));
 		thread_state = DSH_DONE;
 		break;
 	case ESLURMD_KILL_JOB_FAILED:		/* non-killable process */