diff --git a/src/main.cpp b/src/main.cpp
index 9ceb9ab..23f3c5f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -468,7 +468,13 @@
     for (const auto& objectPath : interfaceMap)
     {
         const auto& thisPath = objectPath.first;
-        if (boost::starts_with(reqPath, thisPath) && (reqPath != thisPath))
+
+        if (reqPath == thisPath)
+        {
+            continue;
+        }
+
+        if (boost::starts_with(reqPath, thisPath))
         {
             if (interfaces.empty())
             {
@@ -538,7 +544,6 @@
     }
     // Interfaces need to be sorted for intersect to function
     std::sort(interfaces.begin(), interfaces.end());
-    std::vector<InterfaceMapType::value_type> ret;
 
     if (boost::ends_with(reqPath, "/"))
     {
@@ -550,6 +555,7 @@
             ResourceNotFound();
     }
 
+    std::vector<InterfaceMapType::value_type> ret;
     for (const auto& objectPath : interfaceMap)
     {
         const auto& thisPath = objectPath.first;
@@ -593,7 +599,6 @@
     }
     // Interfaces need to be sorted for intersect to function
     std::sort(interfaces.begin(), interfaces.end());
-    std::vector<std::string> ret;
 
     if (boost::ends_with(reqPath, "/"))
     {
@@ -605,6 +610,7 @@
             ResourceNotFound();
     }
 
+    std::vector<std::string> ret;
     for (const auto& objectPath : interfaceMap)
     {
         const auto& thisPath = objectPath.first;