Remove the ridiculous internal error handling