Make sure BundleInstall is always done except for after an error