diff --git a/hcore/senseApis/senseApiManager.cpp b/hcore/senseApis/senseApiManager.cpp
index 0ad29c3..91fe7c3 100644
--- a/hcore/senseApis/senseApiManager.cpp
+++ b/hcore/senseApis/senseApiManager.cpp
@@ -65,7 +65,7 @@ void SenseApiManager::registerSenseApi(const SenseApiInstance& apiInstance)
     auto it = std::find_if(
         senseApiInstances.begin(), senseApiInstances.end(),
         [&apiInstance](const std::unique_ptr<SenseApiInstance>& instance) {
-            return static_cast<const SenseApiInstance&>(*instance) == apiInstance;
+            return const_cast<const SenseApiInstance&>(*instance) == apiInstance;
         }
     );
 
@@ -88,9 +88,11 @@ void SenseApiManager::unregisterSenseApi(const SenseApiInstance& apiInstance)
         }
     );
 
-    if (it != senseApiInstances.end()) {
-        senseApiInstances.erase(it);
-    } else {
+    if (it == senseApiInstances.end())
+    {
         std::cerr << std::string(__func__) + ": Sense API Instance not found.\n";
+        return;
     }
+
+    senseApiInstances.erase(it);
 }