diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index 0e4fbb9465d472ec369947cda55f0bccfa6c6c3b..91958f0b1def2842700fd27b63b3de202c0af96f 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -1870,10 +1870,7 @@ static void _slurm_rpc_step_complete(slurm_msg_t *msg)
 	rc = step_partial_comp(req, &rem, &step_rc);
 
 	if (rc || rem) {	/* some error or not totally done */
-		if (rc) {
-			info("step_partial_comp: %s",
-				slurm_strerror(rc));
-		}
+		/* Note: Error printed within step_partial_comp */
 		unlock_slurmctld(job_write_lock);
 		slurm_send_rc_msg(msg, rc);
 		if (!rc)	/* partition completion */
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index a4a3f4c8d16a2b8eb0df0a8b0848001703c7ae4e..921a204b8c69a1098e049c6208f5aa120a637f56 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -1795,13 +1795,20 @@ extern int step_partial_comp(step_complete_msg_t *req, int *rem,
 
 	/* find the job, step, and validate input */
 	job_ptr = find_job_record (req->job_id);
-	if (job_ptr == NULL)
+	if (job_ptr == NULL) {
+		info("step_partial_comp: JobID=%u invalid", req->job_id);
 		return ESLURM_INVALID_JOB_ID;
-	if (job_ptr->job_state == JOB_PENDING)
+	}
+	if (job_ptr->job_state == JOB_PENDING) {
+		info("step_partial_comp: JobID=%u pending", req->job_id);
 		return ESLURM_JOB_PENDING;
+	}
 	step_ptr = find_step_record(job_ptr, req->job_step_id);
-	if (step_ptr == NULL)
+	if (step_ptr == NULL) {
+		info("step_partial_comp: StepID=%u.%u invalid", 
+		     req->job_id, req->job_step_id);
 		return ESLURM_INVALID_JOB_ID;
+	}
 	if (step_ptr->batch_step) {
 		if(rem)
 			*rem = 0;
@@ -1817,8 +1824,8 @@ extern int step_partial_comp(step_complete_msg_t *req, int *rem,
 		return SLURM_SUCCESS;
 	}
 	if (req->range_last < req->range_first) {
-		error("step_partial_comp: range: %u-%u", req->range_first, 
-			req->range_last);
+		error("step_partial_comp: JobID=%u range=%u-%u", 
+		      req->job_id, req->range_first, req->range_last);
 		return EINVAL;
 	}
 
@@ -1828,8 +1835,8 @@ extern int step_partial_comp(step_complete_msg_t *req, int *rem,
 		/* initialize the node bitmap for exited nodes */
 		nodes = bit_set_count(step_ptr->step_node_bitmap);
 		if (req->range_last >= nodes) {	/* range is zero origin */
-			error("step_partial_comp: last=%u, nodes=%d",
-				req->range_last, nodes);
+			error("step_partial_comp: JobID=%u last=%u, nodes=%d",
+			      req->job_id, req->range_last, nodes);
 			return EINVAL;
 		}
 		step_ptr->exit_node_bitmap = bit_alloc(nodes);
@@ -1839,8 +1846,8 @@ extern int step_partial_comp(step_complete_msg_t *req, int *rem,
 	} else {
 		nodes = _bitstr_bits(step_ptr->exit_node_bitmap);
 		if (req->range_last >= nodes) {	/* range is zero origin */
-			error("step_partial_comp: last=%u, nodes=%d",
-				req->range_last, nodes);
+			error("step_partial_comp: JobID=%u last=%u, nodes=%d",
+			      req->job_id, req->range_last, nodes);
 			return EINVAL;
 		}
 		step_ptr->exit_code = MAX(step_ptr->exit_code, req->step_rc);