dont rollback outside of a transaction
Merge pull request #496 from sillylogger/rollback_transactions

dont rollback outside of a transaction