diff --git a/src/plugins/select/cray/select_cray.c b/src/plugins/select/cray/select_cray.c
index 4a43a724716fca7232483341c91145781b665f36..17a84d95f7b139c436231c1a8b2033f5efdddb5c 100644
--- a/src/plugins/select/cray/select_cray.c
+++ b/src/plugins/select/cray/select_cray.c
@@ -860,12 +860,10 @@ extern char *select_p_select_jobinfo_sprint(select_jobinfo_t *jobinfo,
 			error("select/cray jobinfo_sprint: jobinfo bad");
 			return NULL;
 		}
-		/* FIXME: in the future print out the header here (if needed)
-		 * You will need to return buf instead of NULL as well.
-		 */
+		/* FIXME: in the future print out the header here (if needed) */
 		/* snprintf(buf, size, "%s", header); */
 
-		return NULL;
+		return buf;
 	}
 
 	switch (mode) {
@@ -894,12 +892,10 @@ extern char *select_p_select_jobinfo_xstrdup(select_jobinfo_t *jobinfo,
 			error("select/cray jobinfo_xstrdup: jobinfo bad");
 			return NULL;
 		}
-		/* FIXME: in the future copy the header here (if needed)
-		 * You will need to return buf instead of NULL as well.
-		 */
+		/* FIXME: in the future copy the header here (if needed) */
 		/* xstrcat(buf, header); */
 
-		return NULL;
+		return buf;
 	}
 
 	switch (mode) {