better handling of records that shouldnt be saved