Update error handling to do what the README says