diff --git a/Makefile b/Makefile
index f67517d5..afa43049 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ all: clean gen
 .PHONY: clean
 clean:
 	rm -rf ${PWD}/bin/*
+	rm -rf ${PWD}/cache/*
 
 .PHONY: gen
 gen: go-gen-proto rs-gen-proto ee/psso/gen
diff --git a/ee/wcp/ak_cred_provider/Provider.cpp b/ee/wcp/ak_cred_provider/Provider.cpp
index c4c68234..07ac5234 100644
--- a/ee/wcp/ak_cred_provider/Provider.cpp
+++ b/ee/wcp/ak_cred_provider/Provider.cpp
@@ -124,12 +124,19 @@ void Provider::SetCefApp(sHookData* pData) {
     // Initialize the CEF browser process. May return false if initialization
     // fails or if early exit is desired (for example, due to process singleton
     // relaunch behavior).
-    if (!CefInitialize(main_args, settings, m_pCefApp.get(), sandbox_info)) {
-      spdlog::debug("CefGetExitCode");
-      // return CefGetExitCode();
-      m_pCefApp = nullptr;
+    if (m_pCefApp)
+    {
+      if (!CefInitialize(main_args, settings, m_pCefApp.get(), sandbox_info)) {
+        spdlog::debug("CefGetExitCode");
+        // return CefGetExitCode();
+        m_pCefApp = nullptr;
+      }
+      spdlog::debug("CefInitialize");
+    }
+    else
+    {
+      spdlog::debug("SetCefApp: Could not instantiate SimpleApp. CEF app setup failed.");
     }
-    spdlog::debug("CefInitialize");
     // Run the CEF message loop. This will block until CefQuitMessageLoop() is
     // called.
     // CefRunMessageLoop();