We were leaking goroutines because the error channel had no readers
left due to the early exit. Refactor slightly the logic to avoid this
problem.