Cleaning up CRUD error checking