Fixed so rollback exception would end properly