1 files changed, 21 insertions, 6 deletions
diff --git a/lib/docx/docx-reader.js b/lib/docx/docx-reader.js
index 6ad63ab..0c7d57f 100644
--- a/lib/docx/docx-reader.js
+++ b/lib/docx/docx-reader.js
@@ -14,6 +14,7 @@ var contentTypesReader = require("./content-types-reader");
 var numberingXml = require("./numbering-xml");
 var stylesReader = require("./styles-reader");
 var notesReader = require("./notes-reader");
+var commentsReader = require("./comments-reader");
 var Files = require("./files").Files;
 
 
@@ -40,6 +41,13 @@ function read(docxFile, input) {
                 } else {
                     return new Result([]);
                 }
+            }),
+            comments: readXmlFileWithBody("comments", result, function(bodyReader, xml) {
+                if (xml) {
+                    return commentsReader.createCommentsReader(bodyReader)(xml);
+                } else {
+                    return new Result([]);
+                }
             })
         };
     }).also(function(result) {
@@ -52,13 +60,20 @@ function read(docxFile, input) {
         };
     }).then(function(result) {
         return readXmlFileWithBody("document", result, function(bodyReader, xml) {
-            return result.notes.flatMap(function(notes) {
-                var reader = new DocumentXmlReader({
-                    bodyReader: bodyReader,
-                    notes: notes
+            if (xml) {
+                return result.notes.flatMap(function(notes) {
+                    return result.comments.flatMap(function(comments) {
+                        var reader = new DocumentXmlReader({
+                            bodyReader: bodyReader,
+                            notes: notes,
+                            comments: comments
+                        });
+                        return reader.convertXmlToDocument(xml);
+                    });
                 });
-                return reader.convertXmlToDocument(xml);
-            });
+            } else {
+                throw new Error("Could not find word/document.xml in ZIP file. Are you sure this is a valid .docx file?");
+            }
         });
     });
 }