8 files changed, 85 insertions, 157 deletions

diff --git a/src/api/burn/balutil/balcondition.cpp b/src/api/burn/balutil/balcondition.cpp
index 8b05508f..00a46e05 100644
--- a/src/api/burn/balutil/balcondition.cpp
+++ b/src/api/burn/balutil/balcondition.cpp
@@ -35,10 +35,10 @@ DAPI_(HRESULT) BalConditionsParseFromXml(
     while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL)))
     {
         hr = XmlGetAttributeEx(pNode, L"Condition", &prgConditions[iCondition].sczCondition);
-        ExitOnFailure(hr, "Failed to get condition for condition.");
+        ExitOnRequiredXmlQueryFailure(hr, "Failed to get condition for condition.");
 
         hr = XmlGetAttributeEx(pNode, L"Message", &prgConditions[iCondition].sczMessage);
-        ExitOnFailure(hr, "Failed to get message for condition.");
+        ExitOnRequiredXmlQueryFailure(hr, "Failed to get message for condition.");
 
         if (pWixLoc && prgConditions[iCondition].sczMessage && *prgConditions[iCondition].sczMessage)
         {
diff --git a/src/api/burn/balutil/balinfo.cpp b/src/api/burn/balutil/balinfo.cpp
index 29e453f6..5832281f 100644
--- a/src/api/burn/balutil/balinfo.cpp
+++ b/src/api/burn/balutil/balinfo.cpp
@@ -123,29 +123,21 @@ DAPI_(HRESULT) BalInfoParseFromXml(
 {
     HRESULT hr = S_OK;
     IXMLDOMNode* pNode = NULL;
+    BOOL fXmlFound = FALSE;
 
     hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixBundleProperties", &pNode);
-    ExitOnFailure(hr, "Failed to select bundle information.");
+    BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to select bundle information.");
 
-    if (S_OK == hr)
+    if (fXmlFound)
     {
         hr = XmlGetYesNoAttribute(pNode, L"PerMachine", &pBundle->fPerMachine);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to read bundle information per-machine.");
-        }
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to read bundle information per-machine.");
 
         hr = XmlGetAttributeEx(pNode, L"DisplayName", &pBundle->sczName);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to read bundle information display name.");
-        }
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to read bundle information display name.");
 
         hr = XmlGetAttributeEx(pNode, L"LogPathVariable", &pBundle->sczLogVariable);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to read bundle information log path variable.");
-        }
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to read bundle information log path variable.");
     }
 
     hr = ParseOverridableVariablesFromXml(&pBundle->overridableVariables, pixdManifest);
@@ -192,7 +184,7 @@ DAPI_(HRESULT) BalInfoAddRelatedBundleAsPackage(
         break;
 
     default:
-        ExitOnFailure(hr = E_INVALIDARG, "Unknown related bundle type: %u", relationType);
+        ExitWithRootFailure(hr, E_INVALIDARG, "Unknown related bundle type: %u", relationType);
     }
 
     // Check to see if the bundle is already in the list of packages.
@@ -403,6 +395,7 @@ static HRESULT ParsePackagesFromXml(
     BAL_INFO_PACKAGE* prgPackages = NULL;
     DWORD cPackages = 0;
     LPWSTR scz = NULL;
+    BOOL fXmlFound = FALSE;
 
     hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixPackageProperties", &pNodeList);
     ExitOnFailure(hr, "Failed to select all packages.");
@@ -417,22 +410,16 @@ static HRESULT ParsePackagesFromXml(
     while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL)))
     {
         hr = XmlGetAttributeEx(pNode, L"Package", &prgPackages[iPackage].sczId);
-        ExitOnFailure(hr, "Failed to get package identifier for package.");
+        ExitOnRequiredXmlQueryFailure(hr, "Failed to get package identifier for package.");
 
         hr = XmlGetAttributeEx(pNode, L"DisplayName", &prgPackages[iPackage].sczDisplayName);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get display name for package.");
-        }
+        ExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get display name for package.");
 
         hr = XmlGetAttributeEx(pNode, L"Description", &prgPackages[iPackage].sczDescription);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get description for package.");
-        }
+        ExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get description for package.");
 
         hr = XmlGetAttributeEx(pNode, L"PackageType", &scz);
-        ExitOnFailure(hr, "Failed to get package type for package.");
+        ExitOnRequiredXmlQueryFailure(hr, "Failed to get package type for package.");
 
         if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, L"Bundle", -1, scz, -1))
         {
@@ -456,43 +443,28 @@ static HRESULT ParsePackagesFromXml(
         }
 
         hr = XmlGetYesNoAttribute(pNode, L"Permanent", &prgPackages[iPackage].fPermanent);
-        ExitOnFailure(hr, "Failed to get permanent setting for package.");
+        ExitOnRequiredXmlQueryFailure(hr, "Failed to get permanent setting for package.");
 
         hr = XmlGetYesNoAttribute(pNode, L"Vital", &prgPackages[iPackage].fVital);
-        ExitOnFailure(hr, "Failed to get vital setting for package.");
+        ExitOnRequiredXmlQueryFailure(hr, "Failed to get vital setting for package.");
 
         hr = XmlGetAttributeEx(pNode, L"ProductCode", &prgPackages[iPackage].sczProductCode);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get product code for package.");
-        }
+        ExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get product code for package.");
 
         hr = XmlGetAttributeEx(pNode, L"UpgradeCode", &prgPackages[iPackage].sczUpgradeCode);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get upgrade code for package.");
-        }
+        ExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get upgrade code for package.");
 
         hr = XmlGetAttributeEx(pNode, L"Version", &prgPackages[iPackage].sczVersion);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get version for package.");
-        }
+        ExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get version for package.");
 
         hr = XmlGetAttributeEx(pNode, L"InstallCondition", &prgPackages[iPackage].sczInstallCondition);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get install condition for package.");
-        }
+        ExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get install condition for package.");
 
         hr = XmlGetAttributeEx(pNode, L"RepairCondition", &prgPackages[iPackage].sczRepairCondition);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get repair condition for package.");
-        }
+        ExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get repair condition for package.");
 
         hr = XmlGetAttributeEx(pNode, L"Cache", &scz);
-        ExitOnFailure(hr, "Failed to get cache type for package.");
+        ExitOnRequiredXmlQueryFailure(hr, "Failed to get cache type for package.");
 
         if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"remove", -1))
         {
@@ -541,6 +513,7 @@ static HRESULT ParseBalPackageInfoFromXml(
     IXMLDOMNode* pNode = NULL;
     LPWSTR scz = NULL;
     BAL_INFO_PACKAGE* pPackage = NULL;
+    BOOL fXmlFound = FALSE;
 
     hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixBalPackageInfo", &pNodeList);
     ExitOnFailure(hr, "Failed to select all packages.");
@@ -548,16 +521,13 @@ static HRESULT ParseBalPackageInfoFromXml(
     while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL)))
     {
         hr = XmlGetAttributeEx(pNode, L"PackageId", &scz);
-        ExitOnFailure(hr, "Failed to get package identifier for WixBalPackageInfo.");
+        ExitOnRequiredXmlQueryFailure(hr, "Failed to get package identifier for WixBalPackageInfo.");
 
         hr = BalInfoFindPackageById(pPackages, scz, &pPackage);
         ExitOnFailure(hr, "Failed to find package specified in WixBalPackageInfo: %ls", scz);
 
         hr = XmlGetAttributeEx(pNode, L"DisplayInternalUICondition", &pPackage->sczDisplayInternalUICondition);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get DisplayInternalUICondition setting for package.");
-        }
+        ExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get DisplayInternalUICondition setting for package.");
 
         ReleaseNullObject(pNode);
     }
@@ -569,7 +539,7 @@ static HRESULT ParseBalPackageInfoFromXml(
     while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL)))
     {
         hr = XmlGetAttributeEx(pNode, L"PackageId", &scz);
-        ExitOnFailure(hr, "Failed to get package identifier for WixMbaPrereqInformation.");
+        ExitOnRequiredXmlQueryFailure(hr, "Failed to get package identifier for WixMbaPrereqInformation.");
 
         hr = BalInfoFindPackageById(pPackages, scz, &pPackage);
         ExitOnFailure(hr, "Failed to find package specified in WixMbaPrereqInformation: %ls", scz);
@@ -577,16 +547,10 @@ static HRESULT ParseBalPackageInfoFromXml(
         pPackage->fPrereqPackage = TRUE;
 
         hr = XmlGetAttributeEx(pNode, L"LicenseFile", &pPackage->sczPrereqLicenseFile);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get LicenseFile setting for prereq package.");
-        }
+        ExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get LicenseFile setting for prereq package.");
 
         hr = XmlGetAttributeEx(pNode, L"LicenseUrl", &pPackage->sczPrereqLicenseUrl);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get LicenseUrl setting for prereq package.");
-        }
+        ExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get LicenseUrl setting for prereq package.");
 
         ReleaseNullObject(pNode);
     }
@@ -619,15 +583,11 @@ static HRESULT ParseOverridableVariablesFromXml(
     BAL_INFO_OVERRIDABLE_VARIABLE* pOverridableVariable = NULL;
 
     hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/CommandLine", &pCommandLineNode);
-    if (S_FALSE == hr)
-    {
-        hr = E_NOTFOUND;
-    }
-    ExitOnFailure(hr, "Failed to select command line information.");
+    ExitOnRequiredXmlQueryFailure(hr, "Failed to select command line information.");
 
     // @Variables
     hr = XmlGetAttributeEx(pCommandLineNode, L"Variables", &scz);
-    ExitOnFailure(hr, "Failed to get command line variable type.");
+    ExitOnRequiredXmlQueryFailure(hr, "Failed to get command line variable type.");
 
     if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"upperCase", -1))
     {
@@ -639,16 +599,11 @@ static HRESULT ParseOverridableVariablesFromXml(
     }
     else
     {
-        hr = E_INVALIDARG;
-        ExitOnFailure(hr, "Invalid value for CommandLine/@Variables: %ls", scz);
+        ExitWithRootFailure(hr, E_INVALIDARG, "Invalid value for CommandLine/@Variables: %ls", scz);
     }
 
     // Get the list of variables users can override on the command line.
     hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixStdbaOverridableVariable", &pNodes);
-    if (S_FALSE == hr)
-    {
-        ExitFunction1(hr = S_OK);
-    }
     ExitOnFailure(hr, "Failed to select overridable variable nodes.");
 
     hr = pNodes->get_length(reinterpret_cast<long*>(&pOverridableVariables->cVariables));
@@ -671,7 +626,7 @@ static HRESULT ParseOverridableVariablesFromXml(
 
             // @Name
             hr = XmlGetAttributeEx(pNode, L"Name", &pOverridableVariable->sczName);
-            ExitOnFailure(hr, "Failed to get name for overridable variable.");
+            ExitOnRequiredXmlQueryFailure(hr, "Failed to get name for overridable variable.");
 
             hr = DictAddValue(pOverridableVariables->sdVariables, pOverridableVariable);
             ExitOnFailure(hr, "Failed to add \"%ls\" to the string dictionary.", pOverridableVariable->sczName);
diff --git a/src/api/burn/balutil/inc/balutil.h b/src/api/burn/balutil/inc/balutil.h
index 0c47301a..2e370db7 100644
--- a/src/api/burn/balutil/inc/balutil.h
+++ b/src/api/burn/balutil/inc/balutil.h
@@ -16,6 +16,8 @@ extern "C" {
 #define BalExitOnNullSource(d, p, x, e, f, ...) if (NULL == p) { x = e; BalLogError(x, f, __VA_ARGS__); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; }
 #define BalExitOnNullWithLastErrorSource(d, p, x, f, ...) if (NULL == p) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } BalLogError(x, f, __VA_ARGS__); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; }
 #define BalExitWithLastErrorSource(d, x, f, ...) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } BalLogError(x, f, __VA_ARGS__); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; }
+#define BalExitOnOptionalXmlQueryFailureSource(d, x, b, f, ...) { { if (S_FALSE == x || E_NOTFOUND == x) { b = FALSE; x = S_OK; } else { b = SUCCEEDED(x); } }; BalExitOnRootFailureSource(d, x, f, __VA_ARGS__); }
+#define BalExitOnRequiredXmlQueryFailureSource(d, x, f, ...) { if (S_FALSE == x) { x = E_NOTFOUND; } BalExitOnRootFailureSource(d, x, f, __VA_ARGS__); }
 
 #define BalExitOnFailure(x, f, ...) BalExitOnFailureSource(DUTIL_SOURCE_DEFAULT, x, f, __VA_ARGS__)
 #define BalExitOnRootFailure(x, f, ...) BalExitOnRootFailureSource(DUTIL_SOURCE_DEFAULT, x, f, __VA_ARGS__)
@@ -24,6 +26,8 @@ extern "C" {
 #define BalExitOnNull(p, x, e, f, ...) BalExitOnNullSource(DUTIL_SOURCE_DEFAULT, p, x, e, f, __VA_ARGS__)
 #define BalExitOnNullWithLastError(p, x, f, ...) BalExitOnNullWithLastErrorSource(DUTIL_SOURCE_DEFAULT, p, x, f, __VA_ARGS__)
 #define BalExitWithLastError(x, f, ...) BalExitWithLastErrorSource(DUTIL_SOURCE_DEFAULT, x, f, __VA_ARGS__)
+#define BalExitOnOptionalXmlQueryFailure(x, b, f, ...) BalExitOnOptionalXmlQueryFailureSource(DUTIL_SOURCE_DEFAULT, x, b, f, __VA_ARGS__)
+#define BalExitOnRequiredXmlQueryFailure(x, f, ...) BalExitOnRequiredXmlQueryFailureSource(DUTIL_SOURCE_DEFAULT, x, f, __VA_ARGS__)
 
 #ifndef FACILITY_WIX
 #define FACILITY_WIX 500
diff --git a/src/api/burn/bextutil/bextutil.cpp b/src/api/burn/bextutil/bextutil.cpp
index 4b22d502..b2e689c3 100644
--- a/src/api/burn/bextutil/bextutil.cpp
+++ b/src/api/burn/bextutil/bextutil.cpp
@@ -85,7 +85,7 @@ DAPI_(HRESULT) BextGetBundleExtensionDataNode(
 
         // @Id
         hr = XmlGetAttributeEx(pixnNode, L"Id", &sczId);
-        ExitOnFailure(hr, "Failed to get @Id.");
+        ExitOnRequiredXmlQueryFailure(hr, "Failed to get @Id.");
 
         if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczId, -1, wzExtensionId, -1))
         {
diff --git a/src/api/burn/bextutil/inc/bextutil.h b/src/api/burn/bextutil/inc/bextutil.h
index facaf2e8..e3edff01 100644
--- a/src/api/burn/bextutil/inc/bextutil.h
+++ b/src/api/burn/bextutil/inc/bextutil.h
@@ -16,6 +16,8 @@ extern "C" {
 #define BextExitOnNullSource(d, p, x, e, f, ...) if (NULL == p) { x = e; BextLogError(x, f, __VA_ARGS__); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; }
 #define BextExitOnNullWithLastErrorSource(d, p, x, f, ...) if (NULL == p) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } BextLogError(x, f, __VA_ARGS__); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; }
 #define BextExitWithLastErrorSource(d, x, f, ...) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } BextLogError(x, f, __VA_ARGS__); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; }
+#define BextExitOnOptionalXmlQueryFailureSource(d, x, b, f, ...) { { if (S_FALSE == x || E_NOTFOUND == x) { b = FALSE; x = S_OK; } else { b = SUCCEEDED(x); } }; BextExitOnRootFailureSource(d, x, f, __VA_ARGS__); }
+#define BextExitOnRequiredXmlQueryFailureSource(d, x, f, ...) { if (S_FALSE == x) { x = E_NOTFOUND; } BextExitOnRootFailureSource(d, x, f, __VA_ARGS__); }
 
 #define BextExitOnFailure(x, f, ...) BextExitOnFailureSource(DUTIL_SOURCE_DEFAULT, x, f, __VA_ARGS__)
 #define BextExitOnRootFailure(x, f, ...) BextExitOnRootFailureSource(DUTIL_SOURCE_DEFAULT, x, f, __VA_ARGS__)
@@ -24,6 +26,8 @@ extern "C" {
 #define BextExitOnNull(p, x, e, f, ...) BextExitOnNullSource(DUTIL_SOURCE_DEFAULT, p, x, e, f, __VA_ARGS__)
 #define BextExitOnNullWithLastError(p, x, f, ...) BextExitOnNullWithLastErrorSource(DUTIL_SOURCE_DEFAULT, p, x, f, __VA_ARGS__)
 #define BextExitWithLastError(x, f, ...) BextExitWithLastErrorSource(DUTIL_SOURCE_DEFAULT, x, f, __VA_ARGS__)
+#define BextExitOnOptionalXmlQueryFailure(x, b, f, ...) BextExitOnOptionalXmlQueryFailureSource(DUTIL_SOURCE_DEFAULT, x, b, f, __VA_ARGS__)
+#define BextExitOnRequiredXmlQueryFailure(x, f, ...) BextExitOnRequiredXmlQueryFailureSource(DUTIL_SOURCE_DEFAULT, x, f, __VA_ARGS__)
 
 const LPCWSTR BUNDLE_EXTENSION_MANIFEST_FILENAME = L"BundleExtensionData.xml";
 
diff --git a/src/ext/Bal/dnchost/dnchost.cpp b/src/ext/Bal/dnchost/dnchost.cpp
index dcc9fa56..644ba30e 100644
--- a/src/ext/Bal/dnchost/dnchost.cpp
+++ b/src/ext/Bal/dnchost/dnchost.cpp
@@ -168,21 +168,16 @@ static HRESULT LoadDncConfiguration(
     IXMLDOMNode* pixnHost = NULL;
     LPWSTR sczPayloadName = NULL;
     DWORD dwBool = 0;
+    BOOL fXmlFound = FALSE;
 
     hr = XmlLoadDocumentFromFile(pArgs->pCommand->wzBootstrapperApplicationDataPath, &pixdManifest);
     BalExitOnFailure(hr, "Failed to load BalManifest '%ls'", pArgs->pCommand->wzBootstrapperApplicationDataPath);
 
     hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixBalBAFactoryAssembly", &pixnHost);
-    BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly element.");
-
-    if (S_FALSE == hr)
-    {
-        hr = E_NOTFOUND;
-        BalExitOnRootFailure(hr, "Failed to find WixBalBAFactoryAssembly element in bootstrapper application config.");
-    }
+    BalExitOnRequiredXmlQueryFailure(hr, "Failed to get WixBalBAFactoryAssembly element.");
 
     hr = XmlGetAttributeEx(pixnHost, L"FilePath", &sczPayloadName);
-    BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@FilePath.");
+    BalExitOnRequiredXmlQueryFailure(hr, "Failed to get WixBalBAFactoryAssembly/@FilePath.");
 
     hr = PathConcat(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath);
     BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath.");
@@ -212,22 +207,20 @@ static HRESULT LoadDncConfiguration(
     pState->type = DNCHOSTTYPE_FDD;
 
     hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixDncOptions", &pixnHost);
-    if (S_FALSE == hr)
+    BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to find WixDncOptions element in bootstrapper application config.");
+
+    if (!fXmlFound)
     {
-        ExitFunction1(hr = S_OK);
+        ExitFunction();
     }
-    BalExitOnFailure(hr, "Failed to find WixDncOptions element in bootstrapper application config.");
 
     hr = XmlGetAttributeNumber(pixnHost, L"SelfContainedDeployment", &dwBool);
-    if (S_FALSE == hr)
-    {
-        hr = S_OK;
-    }
-    else if (SUCCEEDED(hr) && dwBool)
+    BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get SelfContainedDeployment value.");
+
+    if (fXmlFound && dwBool)
     {
         pState->type = DNCHOSTTYPE_SCD;
     }
-    BalExitOnFailure(hr, "Failed to get SelfContainedDeployment value.");
 
 LExit:
     ReleaseStr(sczPayloadName);
diff --git a/src/ext/Bal/mbahost/mbahost.cpp b/src/ext/Bal/mbahost/mbahost.cpp
index 735f9f21..a9585389 100644
--- a/src/ext/Bal/mbahost/mbahost.cpp
+++ b/src/ext/Bal/mbahost/mbahost.cpp
@@ -290,7 +290,7 @@ static HRESULT CheckSupportedFrameworks(
         while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL)))
         {
             hr = XmlGetAttributeEx(pNode, L"version", &sczSupportedFrameworkVersion);
-            ExitOnFailure(hr, "Failed to get supportedFramework/@version.");
+            ExitOnRequiredXmlQueryFailure(hr, "Failed to get supportedFramework/@version.");
 
             hr = StrAllocFormatted(&sczFrameworkRegistryKey, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\%ls", sczSupportedFrameworkVersion);
             ExitOnFailure(hr, "Failed to allocate path to supported framework Install registry key.");
@@ -351,27 +351,23 @@ static HRESULT UpdateSupportedRuntime(
     LPWSTR sczSupportedRuntimeVersion = NULL;
     IXMLDOMNode* pixnStartup = NULL;
     IXMLDOMNode* pixnSupportedRuntime = NULL;
+    BOOL fXmlFound = FALSE;
 
     *pfUpdatedManifest = FALSE;
 
     // If the runtime version attribute is not specified, don't update the manifest.
     hr = XmlGetAttributeEx(pixnSupportedFramework, L"runtimeVersion", &sczSupportedRuntimeVersion);
-    if (E_NOTFOUND == hr)
+    ExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get supportedFramework/@runtimeVersion.");
+
+    if (!fXmlFound)
     {
-        ExitFunction1(hr = S_OK);
+        ExitFunction();
     }
-    ExitOnFailure(hr, "Failed to get supportedFramework/@runtimeVersion.");
 
     // Get the startup element. Fail if we can't find it since it'll be necessary to load the
     // correct runtime.
     hr = XmlSelectSingleNode(pixdManifest, L"/configuration/startup", &pixnStartup);
-    ExitOnFailure(hr, "Failed to get startup element.");
-
-    if (S_FALSE == hr)
-    {
-        hr = E_NOTFOUND;
-        ExitOnRootFailure(hr, "Failed to find startup element in bootstrapper application config.");
-    }
+    ExitOnRequiredXmlQueryFailure(hr, "Failed to get startup element.");
 
     // Remove any pre-existing supported runtimes because they'll just get in the way and create our new one.
     hr = XmlRemoveChildren(pixnStartup, L"supportedRuntime");
diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
index c89d12c4..dd00a563 100644
--- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
@@ -2603,95 +2603,70 @@ private:
         HRESULT hr = S_OK;
         IXMLDOMNode* pNode = NULL;
         DWORD dwBool = 0;
+        BOOL fXmlFound = FALSE;
 
         hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixStdbaInformation", &pNode);
-        if (S_FALSE == hr)
-        {
-            hr = E_INVALIDARG;
-        }
-        BalExitOnFailure(hr, "BootstrapperApplication.xml manifest is missing wixstdba information.");
+        BalExitOnRequiredXmlQueryFailure(hr, "BootstrapperApplication.xml manifest is missing wixstdba information.");
 
         hr = XmlGetAttributeEx(pNode, L"LicenseFile", &m_sczLicenseFile);
-        if (E_NOTFOUND == hr)
-        {
-            hr = S_OK;
-        }
-        BalExitOnFailure(hr, "Failed to get license file.");
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get license file.");
 
         hr = XmlGetAttributeEx(pNode, L"LicenseUrl", &m_sczLicenseUrl);
-        if (E_NOTFOUND == hr)
-        {
-            hr = S_OK;
-        }
-        BalExitOnFailure(hr, "Failed to get license URL.");
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get license URL.");
 
         ReleaseObject(pNode);
 
         hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixStdbaOptions", &pNode);
-        if (S_FALSE == hr)
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to read wixstdba options from BootstrapperApplication.xml manifest.");
+
+        if (!fXmlFound)
         {
-            ExitFunction1(hr = S_OK);
+            ExitFunction();
         }
-        BalExitOnFailure(hr, "Failed to read wixstdba options from BootstrapperApplication.xml manifest.");
 
         hr = XmlGetAttributeNumber(pNode, L"SuppressOptionsUI", &dwBool);
-        if (S_FALSE == hr)
-        {
-            hr = S_OK;
-        }
-        else if (SUCCEEDED(hr) && dwBool)
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get SuppressOptionsUI value.");
+
+        if (fXmlFound && dwBool)
         {
             hr = BalSetNumericVariable(WIXSTDBA_VARIABLE_SUPPRESS_OPTIONS_UI, 1);
             BalExitOnFailure(hr, "Failed to set '%ls' variable.", WIXSTDBA_VARIABLE_SUPPRESS_OPTIONS_UI);
         }
-        BalExitOnFailure(hr, "Failed to get SuppressOptionsUI value.");
 
         dwBool = 0;
         hr = XmlGetAttributeNumber(pNode, L"SuppressDowngradeFailure", &dwBool);
-        if (S_FALSE == hr)
-        {
-            hr = S_OK;
-        }
-        else if (SUCCEEDED(hr))
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get SuppressDowngradeFailure value.");
+
+        if (fXmlFound)
         {
             m_fSuppressDowngradeFailure = 0 < dwBool;
         }
-        BalExitOnFailure(hr, "Failed to get SuppressDowngradeFailure value.");
 
         dwBool = 0;
         hr = XmlGetAttributeNumber(pNode, L"SuppressRepair", &dwBool);
-        if (S_FALSE == hr)
-        {
-            hr = S_OK;
-        }
-        else if (SUCCEEDED(hr))
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get SuppressRepair value.");
+
+        if (fXmlFound)
         {
             m_fSuppressRepair = 0 < dwBool;
         }
-        BalExitOnFailure(hr, "Failed to get SuppressRepair value.");
 
         hr = XmlGetAttributeNumber(pNode, L"ShowVersion", &dwBool);
-        if (S_FALSE == hr)
-        {
-            hr = S_OK;
-        }
-        else if (SUCCEEDED(hr) && dwBool)
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get ShowVersion value.");
+
+        if (fXmlFound && dwBool)
         {
             hr = BalSetNumericVariable(WIXSTDBA_VARIABLE_SHOW_VERSION, 1);
             BalExitOnFailure(hr, "Failed to set '%ls' variable.", WIXSTDBA_VARIABLE_SHOW_VERSION);
         }
-        BalExitOnFailure(hr, "Failed to get ShowVersion value.");
 
         hr = XmlGetAttributeNumber(pNode, L"SupportCacheOnly", &dwBool);
-        if (S_FALSE == hr)
-        {
-            hr = S_OK;
-        }
-        else if (SUCCEEDED(hr))
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get SupportCacheOnly value.");
+
+        if (fXmlFound)
         {
             m_fSupportCacheOnly = 0 < dwBool;
         }
-        BalExitOnFailure(hr, "Failed to get SupportCacheOnly value.");
 
     LExit:
         ReleaseObject(pNode);
@@ -4149,17 +4124,18 @@ LExit:
         LPWSTR sczBafPath = NULL;
         BA_FUNCTIONS_CREATE_ARGS bafCreateArgs = { };
         BA_FUNCTIONS_CREATE_RESULTS bafCreateResults = { };
+        BOOL fXmlFound = FALSE;
 
         hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixBalBAFunctions", &pBAFunctionsNode);
-        BalExitOnFailure(hr, "Failed to read WixBalBAFunctions node from BootstrapperApplicationData.xml.");
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to read WixBalBAFunctions node from BootstrapperApplicationData.xml.");
 
-        if (S_FALSE == hr)
+        if (!fXmlFound)
         {
             ExitFunction();
         }
 
         hr = XmlGetAttributeEx(pBAFunctionsNode, L"FilePath", &sczBafName);
-        BalExitOnFailure(hr, "Failed to get BAFunctions FilePath.");
+        BalExitOnRequiredXmlQueryFailure(hr, "Failed to get BAFunctions FilePath.");
 
         hr = PathRelativeToModule(&sczBafPath, sczBafName, m_hModule);
         BalExitOnFailure(hr, "Failed to get path to BAFunctions DLL.");