Fix rollback on invalid record after set
Merge pull request #1755 from alexspeller/fix-rollback-on-invalid-record-after-set

Fix rollback on invalid record after set