diff --git a/libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp
index c10c2769..1a52cc5b 100644
--- a/libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp
+++ b/libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp
@@ -279,7 +279,8 @@ SecurityLevel WVDrmPlugin::mapSecurityLevel(const std::string& level) {
   }
 
   if (wvcdm::QUERY_VALUE_SECURITY_LEVEL_L3 == native_security_level &&
-      in_securityLevel >= SecurityLevel::SW_SECURE_DECODE) {
+      in_securityLevel >= SecurityLevel::SW_SECURE_DECODE &&
+      in_securityLevel != SecurityLevel::DEFAULT) {
     *_aidl_return = sessionId;
     return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
   }
@@ -1704,7 +1705,7 @@ void WVDrmPlugin::sendEvent(
 
 void WVDrmPlugin::sendExpirationUpdate(const vector<uint8_t>& in_sessionId,
                                        int64_t in_expiryTimeInMS) {
-  ::ndk::ScopedAStatus err;
+  ::ndk::ScopedAStatus err = ::ndk::ScopedAStatus::ok();
   if (mListener != nullptr) {
     err = mListener->onExpirationUpdate(in_sessionId, in_expiryTimeInMS);
   } else {
@@ -1720,7 +1721,7 @@ void WVDrmPlugin::sendKeysChange(
     const vector<uint8_t>& in_sessionId,
     const vector<::aidl::android::hardware::drm::KeyStatus>& in_keyStatusList,
     bool in_hasNewUsableKey) {
-  ::ndk::ScopedAStatus err;
+  ::ndk::ScopedAStatus err = ::ndk::ScopedAStatus::ok();
   if (mListener != nullptr) {
     err = mListener->onKeysChange(in_sessionId, in_keyStatusList,
                                   in_hasNewUsableKey);
@@ -1734,7 +1735,7 @@ void WVDrmPlugin::sendKeysChange(
 }
 
 void WVDrmPlugin::sendSessionLostState(const vector<uint8_t>& in_sessionId) {
-  ::ndk::ScopedAStatus err;
+  ::ndk::ScopedAStatus err = ::ndk::ScopedAStatus::ok();
   if (mListener != nullptr) {
     err = mListener->onSessionLostState(in_sessionId);
   } else {