Extended error handling