diff --git a/inc/button_factory.hpp b/inc/button_factory.hpp
index 81c8e47..1c513ef 100644
--- a/inc/button_factory.hpp
+++ b/inc/button_factory.hpp
@@ -54,8 +54,15 @@
     {
 
         // find matching name in the registry and call factory method.
-
-        return buttonIfaceRegistry.at(name)(bus, event, buttonCfg);
+        auto objectIter = buttonIfaceRegistry.find(name);
+        if (objectIter != buttonIfaceRegistry.end())
+        {
+            return objectIter->second(bus, event, buttonCfg);
+        }
+        else
+        {
+            return nullptr;
+        }
     }
 
   private: