Added transactional check around rollbacks