added findById check after save