And added back the try to allow non-test runs.