Fixed bug where system was trying to remove the first item in the table
if the save on a new entity failed.