diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1
index 32de207275ec64c788e2c4a509e36ef0d680e784..32616885bcf78060bd6e06356e8bbf610ebe1f94 100644
--- a/doc/man/man1/salloc.1
+++ b/doc/man/man1/salloc.1
@@ -714,8 +714,8 @@ Suppress informational messages from salloc. Errors will still be displayed.
 Request a quality of service for the job.  QOS values can be defined
 for each user/cluster/account association in the SLURM database.
 Users will be limited to their association's defined set of qos's when
-the SLURM configuration parameter, AccountingStorageEnforce, is set to
-"qos".
+the SLURM configuration parameter, AccountingStorageEnforce, includes
+"qos" in it's definition.
 
 .TP
 \fB\-\-reservation\fR=<\fIname\fR>
diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1
index e6b7234c4f876d12ea44b8346ec782691535d25a..8d5ea0997f5cac7d119f2d4c8e3fccb51cc30848 100644
--- a/doc/man/man1/sbatch.1
+++ b/doc/man/man1/sbatch.1
@@ -801,8 +801,8 @@ Suppress informational messages from sbatch. Errors will still be displayed.
 Request a quality of service for the job.  QOS values can be defined
 for each user/cluster/account association in the SLURM database.
 Users will be limited to their association's defined set of qos's when
-the SLURM configuration parameter, AccountingStorageEnforce, is set to
-"qos".
+the SLURM configuration parameter, AccountingStorageEnforce, includes
+"qos" in it's definition.
 
 .TP
 \fB\-\-requeue\fR
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index 997f7d1f77417559ef6dfb4dc896a28d08110d78..777858d83935decb0f64a44651de8b392fc198c7 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -889,8 +889,8 @@ running job.
 Request a quality of service for the job.  QOS values can be defined
 for each user/cluster/account association in the SLURM database.
 Users will be limited to their association's defined set of qos's when
-the SLURM configuration parameter, AccountingStorageEnforce, is set to
-"qos".
+the SLURM configuration parameter, AccountingStorageEnforce, includes
+"qos" in it's definition.
 
 .TP
 \fB\-r\fR, \fB\-\-relative\fR=<\fIn\fR>
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 534622158ee0c33173c43e98b78611b7928dfea6..215ed41cdfdab545231f3c0850f45ac39b68e321 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -4202,7 +4202,7 @@ void pack_job(struct job_record *dump_job_ptr, uint16_t show_flags, Buf buffer)
 		packstr(acct_qos_str(assoc_mgr_qos_list, dump_job_ptr->qos),
 			buffer);
 	else
-		packstr(NULL, buffer);
+		packnull(buffer);
 	slurm_mutex_unlock(&assoc_mgr_qos_lock);
 
 	packstr(dump_job_ptr->licenses, buffer);