diff --git a/src/main.cpp b/src/main.cpp
index 95c9acd..3ee6362 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -768,11 +768,24 @@
                              "xyz.openbmc_project.ObjectMapper");
 
     iface->register_method(
-        "GetAncestors", [&interface_map](const std::string& req_path,
+        "GetAncestors", [&interface_map](std::string& req_path,
                                          std::vector<std::string>& interfaces) {
             // Interfaces need to be sorted for intersect to function
             std::sort(interfaces.begin(), interfaces.end());
 
+            if (req_path.size() > 1)
+            {
+                if (req_path.back() == '/')
+                {
+                    req_path.pop_back();
+                }
+
+                if (interface_map.find(req_path) == interface_map.end())
+                {
+                    throw NotFoundException();
+                }
+            }
+
             std::vector<interface_map_type::value_type> ret;
             for (auto& object_path : interface_map)
             {
@@ -800,10 +813,6 @@
                     }
                 }
             }
-            if (ret.empty())
-            {
-                throw NotFoundException();
-            }
 
             return ret;
         });
@@ -855,9 +864,17 @@
             std::sort(interfaces.begin(), interfaces.end());
             std::vector<interface_map_type::value_type> ret;
 
-            if (req_path.size() > 1 && req_path.back() == '/')
+            if (req_path.size() > 1)
             {
-                req_path.pop_back();
+                if (req_path.back() == '/')
+                {
+                    req_path.pop_back();
+                }
+
+                if (interface_map.find(req_path) == interface_map.end())
+                {
+                    throw NotFoundException();
+                }
             }
 
             for (auto& object_path : interface_map)
@@ -890,10 +907,7 @@
                     }
                 }
             }
-            if (ret.empty())
-            {
-                throw NotFoundException();
-            }
+
             return ret;
         });
 
@@ -909,9 +923,17 @@
             std::sort(interfaces.begin(), interfaces.end());
             std::vector<std::string> ret;
 
-            if (req_path.size() > 1 && req_path.back() == '/')
+            if (req_path.size() > 1)
             {
-                req_path.pop_back();
+                if (req_path.back() == '/')
+                {
+                    req_path.pop_back();
+                }
+
+                if (interface_map.find(req_path) == interface_map.end())
+                {
+                    throw NotFoundException();
+                }
             }
 
             for (auto& object_path : interface_map)
@@ -950,10 +972,7 @@
                     }
                 }
             }
-            if (ret.empty())
-            {
-                throw NotFoundException();
-            }
+
             return ret;
         });