Remove the up-front error handling