diff --git a/src/slurmd/common/run_script.c b/src/slurmd/common/run_script.c
index e03e1d3db2d048cc1ed5ca8b8d70ac31964f1a75..95adc3012f5edcb785c9046f80ac8847eee81667 100644
--- a/src/slurmd/common/run_script.c
+++ b/src/slurmd/common/run_script.c
@@ -72,7 +72,11 @@ run_script(const char *name, const char *path, uint32_t jobid,
 	if (path == NULL || path[0] == '\0')
 		return 0;
 
-	debug("[job %u] attempting to run %s [%s]", jobid, name, path);
+	if (jobid) {
+		debug("[job %u] attempting to run %s [%s]", 
+			jobid, name, path);
+	} else
+		debug("attempting to run %s [%s]", name, path);
 
 	if (access(path, R_OK | X_OK) < 0) {
 		debug("Not running %s [%s]: %m", name, path);