diff --git a/libwvdrmengine/include/mapErrors-inl.h b/libwvdrmengine/include/mapErrors-inl.h
index b1b33275..a0143967 100644
--- a/libwvdrmengine/include/mapErrors-inl.h
+++ b/libwvdrmengine/include/mapErrors-inl.h
@@ -257,25 +257,16 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
     case wvcdm::SESSION_INIT_ERROR_2:
       return kSessionInitError2;
     case wvcdm::SESSION_NOT_FOUND_1:
-      return kSessionNotFound1;
     case wvcdm::SESSION_NOT_FOUND_2:
-      return kSessionNotFound2;
     case wvcdm::SESSION_NOT_FOUND_3:
-      return kSessionNotFound3;
     case wvcdm::SESSION_NOT_FOUND_4:
-      return kSessionNotFound4;
     case wvcdm::SESSION_NOT_FOUND_5:
-      return kSessionNotFound5;
     case wvcdm::SESSION_NOT_FOUND_6:
-      return kSessionNotFound6;
     case wvcdm::SESSION_NOT_FOUND_7:
-      return kSessionNotFound7;
     case wvcdm::SESSION_NOT_FOUND_8:
-      return kSessionNotFound8;
     case wvcdm::SESSION_NOT_FOUND_9:
-      return kSessionNotFound9;
     case wvcdm::SESSION_NOT_FOUND_10:
-      return kSessionNotFound10;
+        return android::ERROR_DRM_SESSION_NOT_OPENED;
     case wvcdm::SESSION_KEYS_NOT_FOUND:
       return kSessionKeysNotFound;
     case wvcdm::SIGNATURE_NOT_FOUND: