diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
index 210fd049..609c1cfc 100644
--- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
+++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
@@ -532,7 +532,10 @@ class WatchDog {
     {
       std::unique_lock<std::mutex> lock(mutex_);
       if (running_) {
-        condition_.wait_for(lock, std::chrono::minutes(2));
+        if (!condition_.wait_for(lock, std::chrono::minutes(2),
+                                 [this]() { return !running_; })) {
+          LOGE("Level3 initialization timed out");
+        }
       }
       if (running_) {
         gave_up_ = true;
@@ -857,7 +860,8 @@ class Adapter {
       for (auto& name : library_names) {
         level1_library_ = dlopen((name.c_str()), RTLD_NOW);
         if (!level1_library_) {
-          LOGW("Could not load oemcrypto from path %s.  %s", name.c_str(), dlerror());
+          LOGW("Could not load oemcrypto from path %s.  %s", name.c_str(),
+               dlerror());
         }
       }
       if (!level1_library_) {