diff --git a/NEWS b/NEWS
index 77c66e64adcd8a4e73b6fd2e92dd46d0066a6261..2b302e83a6629f94a4dc496f0fea849c5c51cb3b 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ documents those changes that are of interest to users and admins.
  -- Don't display any completed jobs in smap.
  -- Add NodeCnt to filetxt job completion plugin.
  -- Minor restructuring of how MMCS is polled for DOWN nodes and switches.
+ -- Fix squeue output format for "%s" (node select data).
 
 * Changes in SLURM 0.4.4
 ========================
diff --git a/src/common/node_select.c b/src/common/node_select.c
index 92267a6c65f641d97a31115f067ce0dc14f47698..983a66b715df43e920353a3012793412816f8729 100644
--- a/src/common/node_select.c
+++ b/src/common/node_select.c
@@ -607,7 +607,12 @@ extern char *select_g_sprint_jobinfo(select_jobinfo_t jobinfo,
 		return NULL;
 	}
 
-	if (jobinfo->geometry[0] == (uint16_t) NO_VAL) {
+	if (jobinfo == NULL) {
+		if (mode != SELECT_PRINT_HEAD) {
+			error("select_g_sprint_jobinfo: jobinfo bad");
+			return NULL;
+		}
+	} else if (jobinfo->geometry[0] == (uint16_t) NO_VAL) {
 		for (i=0; i<SYSTEM_DIMENSIONS; i++)
 			geometry[i] = 0;
 	} else {