Update to allow automatic retry on stacks in the 'rollback complete' status, refactored exception handling to allow this