Remove bad error handling