diff --git a/libqpdf/QPDF_pages.cc b/libqpdf/QPDF_pages.cc
index 7b801fdc..90d5a09f 100644
--- a/libqpdf/QPDF_pages.cc
+++ b/libqpdf/QPDF_pages.cc
@@ -82,7 +82,10 @@ QPDF::getAllPages()
             getRoot().replaceKey("/Pages", pages);
         }
         seen.clear();
-        getAllPagesInternal(pages, visited, seen);
+        if (pages.hasKey("/Kids")) {
+            // Ensure we actually found a /Pages object.
+            getAllPagesInternal(pages, visited, seen);
+        }
     }
     return this->m->all_pages;
 }
@@ -93,8 +96,8 @@ QPDF::getAllPagesInternal(
     std::set<QPDFObjGen>& visited,
     std::set<QPDFObjGen>& seen)
 {
-    QPDFObjGen this_og = cur_node.getObjGen();
-    if (visited.count(this_og) > 0) {
+    QPDFObjGen cur_node_og = cur_node.getObjGen();
+    if (visited.count(cur_node_og) > 0) {
         throw QPDFExc(
             qpdf_e_pages,
             this->m->file->getName(),
@@ -102,14 +105,22 @@ QPDF::getAllPagesInternal(
             0,
             "Loop detected in /Pages structure (getAllPages)");
     }
-    visited.insert(this_og);
-    std::string wanted_type;
-    if (cur_node.hasKey("/Kids")) {
-        wanted_type = "/Pages";
-        QPDFObjectHandle kids = cur_node.getKey("/Kids");
-        int n = kids.getArrayNItems();
-        for (int i = 0; i < n; ++i) {
-            QPDFObjectHandle kid = kids.getArrayItem(i);
+    visited.insert(cur_node_og);
+    if (!cur_node.isDictionaryOfType("/Pages")) {
+        warn(
+            qpdf_e_damaged_pdf,
+            "page tree node",
+            m->file->getLastOffset(),
+            "/Type key should be /Pages but is not; overriding");
+        cur_node.replaceKey("/Type", "/Pages"_qpdf);
+    }
+    auto kids = cur_node.getKey("/Kids");
+    int n = kids.getArrayNItems();
+    for (int i = 0; i < n; ++i) {
+        auto kid = kids.getArrayItem(i);
+        if (kid.hasKey("/Kids")) {
+            getAllPagesInternal(kid, visited, seen);
+        } else {
             if (!kid.isIndirect()) {
                 QTC::TC("qpdf", "QPDF handle direct page object");
                 cur_node.warnIfPossible(
@@ -128,23 +139,18 @@ QPDF::getAllPagesInternal(
                 kid = makeIndirectObject(QPDFObjectHandle(kid).shallowCopy());
                 kids.setArrayItem(i, kid);
             }
-            getAllPagesInternal(kid, visited, seen);
+            if (!kid.isDictionaryOfType("/Page")) {
+                warn(
+                    qpdf_e_damaged_pdf,
+                    "page tree node",
+                    this->m->file->getLastOffset(),
+                    "/Type key should be /Page but is not; overriding");
+                kid.replaceKey("/Type", "/Page"_qpdf);
+            }
+            seen.insert(kid.getObjGen());
+            m->all_pages.push_back(kid);
         }
-    } else {
-        wanted_type = "/Page";
-        seen.insert(this_og);
-        m->all_pages.push_back(cur_node);
     }
-
-    if (!cur_node.isDictionaryOfType(wanted_type)) {
-        warn(
-            qpdf_e_damaged_pdf,
-            "page tree node",
-            this->m->file->getLastOffset(),
-            "/Type key should be " + wanted_type + " but is not; overriding");
-        cur_node.replaceKey("/Type", QPDFObjectHandle::newName(wanted_type));
-    }
-    visited.erase(this_og);
 }
 
 void
diff --git a/qpdf/qtest/qpdf/no-pages-types-fix.out b/qpdf/qtest/qpdf/no-pages-types-fix.out
index 81e71eeb..3a1ee1a2 100644
--- a/qpdf/qtest/qpdf/no-pages-types-fix.out
+++ b/qpdf/qtest/qpdf/no-pages-types-fix.out
@@ -1,3 +1,3 @@
-WARNING: no-pages-types.pdf (page tree node, offset 307): /Type key should be /Page but is not; overriding
 WARNING: no-pages-types.pdf (page tree node, offset 307): /Type key should be /Pages but is not; overriding
+WARNING: no-pages-types.pdf (page tree node, offset 307): /Type key should be /Page but is not; overriding
 qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/no-pages-types.out b/qpdf/qtest/qpdf/no-pages-types.out
index 1221b68f..a6ef5f68 100644
--- a/qpdf/qtest/qpdf/no-pages-types.out
+++ b/qpdf/qtest/qpdf/no-pages-types.out
@@ -2,6 +2,6 @@ checking no-pages-types.pdf
 PDF Version: 1.3
 File is not encrypted
 File is not linearized
+WARNING: no-pages-types.pdf (page tree node, offset 135): /Type key should be /Pages but is not; overriding
 WARNING: no-pages-types.pdf (page tree node, offset 307): /Type key should be /Page but is not; overriding
-WARNING: no-pages-types.pdf (page tree node, offset 307): /Type key should be /Pages but is not; overriding
 qpdf: operation succeeded with warnings