diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index e047cd162a0c2c2c345ef780e4c5f05215f02d5b..6bde5c217f4114e19ba97af09d6983a90790c7f1 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -563,7 +563,7 @@ static int _load_job_state(Buf buffer)
 	return SLURM_SUCCESS;
 
       unpack_error:
-	error("Incomplete job data checkpoint file.");
+	error("Incomplete job record");
 	xfree(host);
 	xfree(nodes);
 	xfree(partition);
diff --git a/src/slurmctld/partition_mgr.c b/src/slurmctld/partition_mgr.c
index 0d3f71af294162f15d8a650a7a9780b6c165613a..230184e96bec5f5cf682fd1afb38da6b0e7ac95c 100644
--- a/src/slurmctld/partition_mgr.c
+++ b/src/slurmctld/partition_mgr.c
@@ -662,14 +662,13 @@ int update_part(update_part_msg_t * part_desc)
 		return ESLURM_INVALID_PARTITION_NAME;
 	}
 
-	error_code = 0;
-	part_ptr =
-	    list_find_first(part_list, &list_find_part, part_desc->name);
+	error_code = SLURM_SUCCESS;
+	part_ptr = list_find_first(part_list, &list_find_part, 
+					part_desc->name);
 
 	if (part_ptr == NULL) {
-		error
-		    ("update_part: partition %s does not exist, being created",
-		     part_desc->name);
+		error("update_part: partition %s does not exist, "
+			"being created", part_desc->name);
 		part_ptr = create_part_record();
 		strcpy(part_ptr->name, part_desc->name);
 	}