Added in-race death handling