Missed another fringe case for timeout error handling