More changes to remove need to catch exception.