diff --git a/src/srun/task_state.c b/src/srun/task_state.c
index d2a1dd9d8fc3a9917a4112c3b3095feaa55dc3e4..db7f622d6224d9241bc995c7c79a3810c393e6f6 100644
--- a/src/srun/task_state.c
+++ b/src/srun/task_state.c
@@ -124,15 +124,23 @@ void task_state_update (task_state_t ts, int taskid, task_state_type_t t)
 		bit_set (ts->start_failed, taskid);
 		break;
 	case TS_NORMAL_EXIT:
-		bit_set (ts->normal_exit, taskid);
 		bit_clear (ts->running, taskid);
-		ts->n_exited++;
+		if (bit_test(ts->normal_exit, taskid)) {
+			error("Task %d reported exit for a second time.");
+		} else {
+			bit_set (ts->normal_exit, taskid);
+			ts->n_exited++;
+		}
 		break;
 	case TS_ABNORMAL_EXIT:
 		bit_clear (ts->running, taskid);
-		bit_set (ts->abnormal_exit, taskid);
-		ts->n_exited++;
-		ts->n_abnormal++;
+		if (bit_test(ts->abnormal_exit, taskid)) {
+			error("Task %d reported exit for a second time.");
+		} else {
+			bit_set (ts->abnormal_exit, taskid);
+			ts->n_exited++;
+			ts->n_abnormal++;
+		}
 		break;
 	}