Return optional element from findChild

3 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java
index 117ae34..ca8c3dc 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java
@@ -4,6 +4,7 @@ import org.zwobble.mammoth.internal.documents.Document;
 import org.zwobble.mammoth.internal.documents.Notes;
 import org.zwobble.mammoth.internal.results.InternalResult;
 import org.zwobble.mammoth.internal.xml.XmlElement;
+import org.zwobble.mammoth.internal.xml.XmlElementLike;
 
 public class DocumentXmlReader {
     private final BodyXmlReader bodyReader;
@@ -15,7 +16,7 @@ public class DocumentXmlReader {
     }
 
     public InternalResult<Document> readElement(XmlElement element) {
-        XmlElement body = element.findChild("w:body");
+        XmlElementLike body = element.findChildOrEmpty("w:body");
         return bodyReader.readElements(body.getChildren())
             .toResult()
             .map(children -> new Document(children, notes));
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
index 1f2fd41..fa1941f 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
@@ -51,7 +51,7 @@ public class NumberingXml {
     ) {
         // TODO: in python-mammoth, we allow None here. Check whether that's actually possible or not
         String numId = numElement.getAttribute("w:numId");
-        String abstractNumId = numElement.findChild("w:abstractNumId").getAttribute("w:val");
+        String abstractNumId = numElement.findChild("w:abstractNumId").get().getAttribute("w:val");
         return entry(numId, lookup(abstractNums, abstractNumId).get());
     }
 }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
index e38f2f2..cbb1ab0 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
@@ -33,7 +33,7 @@ public class OfficeXml {
             @Override
             public List<XmlNode> visit(XmlElement element) {
                 if (element.getName().equals("mc:AlternateContent")) {
-                    return element.findChild("mc:Fallback").getChildren();
+                    return element.findChildOrEmpty("mc:Fallback").getChildren();
                 } else {
                     XmlElement collapsedElement = new XmlElement(
                         element.getName(),