Pass error out of transactional update
Apply V1 fix and V2 fix for concurrency together to see if it can work