Further error handling refinement