Error handling refinements.