Make upsert work with empty row; make update error on empty row