Add error handling for all errors