1 files changed, 15 insertions, 1 deletions

diff --git a/src/engine/userexperience.cpp b/src/engine/userexperience.cpp
index 3a36cab6..a0fb341d 100644
--- a/src/engine/userexperience.cpp
+++ b/src/engine/userexperience.cpp
@@ -736,7 +736,8 @@ LExit:
 
 EXTERN_C BAAPI UserExperienceOnDetectComplete(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in HRESULT hrStatus
+    __in HRESULT hrStatus,
+    __in BOOL fEligibleForCleanup
     )
 {
     HRESULT hr = S_OK;
@@ -745,6 +746,7 @@ EXTERN_C BAAPI UserExperienceOnDetectComplete(
 
     args.cbSize = sizeof(args);
     args.hrStatus = hrStatus;
+    args.fEligibleForCleanup = fEligibleForCleanup;
 
     results.cbSize = sizeof(results);
 
@@ -2296,12 +2298,18 @@ static HRESULT SendBAMessage(
 {
     HRESULT hr = S_OK;
 
+    if (!pUserExperience->hUXModule)
+    {
+        ExitFunction();
+    }
+
     hr = pUserExperience->pfnBAProc(message, pvArgs, pvResults, pUserExperience->pvBAProcContext);
     if (hr == E_NOTIMPL)
     {
         hr = S_OK;
     }
 
+LExit:
     return hr;
 }
 
@@ -2314,11 +2322,17 @@ static HRESULT SendBAMessageFromInactiveEngine(
 {
     HRESULT hr = S_OK;
 
+    if (!pUserExperience->hUXModule)
+    {
+        ExitFunction();
+    }
+
     UserExperienceDeactivateEngine(pUserExperience);
 
     hr = SendBAMessage(pUserExperience, message, pvArgs, pvResults);
 
     UserExperienceActivateEngine(pUserExperience);
 
+LExit:
     return hr;
 }