- fix distinct issue

- don't try to actually insert / update if there are errors