Merge "Add error handling to smoke test cleanup."