Small change so that makeEntity just calls save, and save will throw
exceptions properly.