Error handling work continued