diff --git a/NEWS b/NEWS
index 7c598bcc45a4399864cd62dac49104f95b332dc7..34a03e8edb717cb28ee7d7239f0554c36e0757cb 100644
--- a/NEWS
+++ b/NEWS
@@ -105,6 +105,7 @@ documents those changes that are of interest to users and admins.
  - Add logic to save/restore select/cons_res state information.
  - BLUEGENE - make all sprintf's into snprintf's
  - Fix timeout calculation to work correctly for fan out.
+ - Fix for "srun -A" segfault on a node failure.
 
 * Changes in SLURM 1.1.17
 =========================
diff --git a/src/srun/msg.c b/src/srun/msg.c
index 8643de82fbfa4f0749d39baa3a958241731518c7..61d08f01f9ce1c3d901a06c793470eb2a9c4c448 100644
--- a/src/srun/msg.c
+++ b/src/srun/msg.c
@@ -392,7 +392,10 @@ static void _node_fail_handler(int fd, srun_job_t *job)
 	}
 	slurm_mutex_unlock(&job->task_mutex);
 
-	client_io_handler_downnodes(job->client_io, node_ids, num_node_ids);
+	if (!opt.allocate) {
+		client_io_handler_downnodes(job->client_io, node_ids,
+					    num_node_ids);
+	}
 
 	if (!opt.no_kill) {
 		update_job_state(job, SRUN_JOB_FORCETERM);