Fixes #468 :Rollback on error doesn't work