diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index ad612dc790d919bf833653729c2c859439953cf4..330955c50ddf8194316e70f1be28596b12b5df6b 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -2637,8 +2637,13 @@ static void _slurm_rpc_resv_create(slurm_msg_t * msg)
 
 	/* return result */
 	if (error_code) {
-		info("_slurm_rpc_resv_create reservation=%s: %s",
-			resv_desc_ptr->name, slurm_strerror(error_code));
+		if (resv_desc_ptr->name) {
+			info("_slurm_rpc_resv_create reservation=%s: %s",
+			     resv_desc_ptr->name, slurm_strerror(error_code));
+		} else {
+			info("_slurm_rpc_resv_create: %s", 
+			     slurm_strerror(error_code));
+		}
 		slurm_send_rc_msg(msg, error_code);
 	} else {
 		slurm_msg_t response_msg;
diff --git a/src/slurmctld/reservation.c b/src/slurmctld/reservation.c
index a0c7b6ce9c989734ba6fa8f00556ef5d9d4e5e7d..fe178a686ced0f0e2ad6f5906e0cc0bbe00e51cd 100644
--- a/src/slurmctld/reservation.c
+++ b/src/slurmctld/reservation.c
@@ -1136,6 +1136,7 @@ extern int create_resv(resv_desc_msg_t *resv_desc_ptr)
 	uid_t *user_list = NULL;
 	char start_time[32], end_time[32];
 	List license_list = (List) NULL;
+	char *name1, *name2, *val1, *val2;
 
 	if (!resv_list)
 		resv_list = list_create(_del_resv_rec);
@@ -1312,9 +1313,18 @@ extern int create_resv(resv_desc_msg_t *resv_desc_ptr)
 	slurm_make_time_str(&resv_ptr->start_time, start_time,
 			    sizeof(start_time));
 	slurm_make_time_str(&resv_ptr->end_time, end_time, sizeof(end_time));
-	info("sched: Created reservation %s accounts=%s users=%s "
-	     "nodes=%s start=%s end=%s",
-	     resv_ptr->name, resv_ptr->accounts, resv_ptr->users,
+	if (resv_ptr->accounts) {
+		name1 = " accounts=";
+		val1  = resv_ptr->accounts;
+	} else
+		name1 = val1 = "";
+	if (resv_ptr->users) {
+		name2 = " users=";
+		val2  = resv_ptr->users;
+	} else
+		name2 = val2 = "";
+	info("sched: Created reservation %s%s%s%s%s nodes=%s start=%s end=%s",
+	     resv_ptr->name, name1, val1, name2, val2,
 	     resv_ptr->node_list, start_time, end_time);
 	list_append(resv_list, resv_ptr);
 	last_resv_update = now;
@@ -1350,6 +1360,7 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
 	slurmctld_resv_t *resv_backup, *resv_ptr;
 	int error_code = SLURM_SUCCESS, rc;
 	char start_time[32], end_time[32];
+	char *name1, *name2, *val1, *val2;
 
 	if (!resv_list)
 		resv_list = list_create(_del_resv_rec);
@@ -1562,9 +1573,18 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
 	slurm_make_time_str(&resv_ptr->start_time, start_time,
 			    sizeof(start_time));
 	slurm_make_time_str(&resv_ptr->end_time, end_time, sizeof(end_time));
-	info("sched: Update reservation %s accounts=%s users=%s "
-	     "nodes=%s start=%s end=%s",
-	     resv_ptr->name, resv_ptr->accounts, resv_ptr->users,
+	if (resv_ptr->accounts) {
+		name1 = " accounts=";
+		val1  = resv_ptr->accounts;
+	} else
+		name1 = val1 = "";
+	if (resv_ptr->users) {
+		name2 = " users=";
+		val2  = resv_ptr->users;
+	} else
+		name2 = val2 = "";
+	info("sched: Updated reservation %s%s%s%s%s nodes=%s start=%s end=%s",
+	     resv_ptr->name, name1, val1, name2, val2,
 	     resv_ptr->node_list, start_time, end_time);
 
 	_post_resv_update(resv_ptr, resv_backup);