Add a little nuance to the error handling