Updated Rollback on error