diff --git a/core/fpdfdoc/cpdf_nametree.cpp b/core/fpdfdoc/cpdf_nametree.cpp
index adfb890..48157a9 100644
--- a/core/fpdfdoc/cpdf_nametree.cpp
+++ b/core/fpdfdoc/cpdf_nametree.cpp
@@ -221,17 +221,24 @@
   if (pLimits) {
     auto [csLeft, csRight] = GetNodeLimitsAndSanitize(pLimits.Get());
     // Skip this node if the name to look for is smaller than its lower limit.
-    if (csName.Compare(csLeft) < 0)
+    if (csName.Compare(csLeft) < 0) {
       return nullptr;
+    }
 
-    // Skip this node if the name to look for is greater than its higher limit,
-    // and the node itself is a leaf node.
-    if (csName.Compare(csRight) > 0 && pNames) {
-      if (node_to_insert) {
+    if (csName.Compare(csRight) > 0) {
+      // If only trying to find the name node, and not where the name should be
+      // added, skip this node.
+      if (!node_to_insert) {
+        return nullptr;
+      }
+
+      // If the node itself is a leaf node, set `pNames` as the array `csName`
+      // should be added to.
+      if (pNames) {
         node_to_insert->names = pNames;
         node_to_insert->index = fxcrt::CollectionSize<int32_t>(*pNames) / 2 - 1;
+        return nullptr;
       }
-      return nullptr;
     }
   }
 
