diff --git a/transport/HidlPassthroughSupport.cpp b/transport/HidlPassthroughSupport.cpp
index 9d4e2b4..2e1671d 100644
--- a/transport/HidlPassthroughSupport.cpp
+++ b/transport/HidlPassthroughSupport.cpp
@@ -33,11 +33,11 @@
         // interfaceChain fails
         return nullptr;
     }
-    auto iter = gBsConstructorMap.find(myDescriptor);
-    if (iter == gBsConstructorMap.end()) {
+    auto func = gBsConstructorMap.get(myDescriptor, nullptr);
+    if (!func) {
         return nullptr;
     }
-    return (iter->second)(reinterpret_cast<void *>(iface.get()));
+    return func(reinterpret_cast<void *>(iface.get()));
 }