Work on the error handling design.