diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java index de4dbb207c..f945b3457f 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java @@ -436,8 +436,16 @@ public class XSSFReader { sheetPkg.getRelationshipsByType(XSSFRelation.SHEET_COMMENTS.getRelation()); if (!commentsList.isEmpty()) { PackageRelationship comments = commentsList.getRelationship(0); + if (comments == null) { + LOGGER.warn("Failed to find sheet comments packageRelationship"); + return null; + } PackagePartName commentsName = PackagingURIHelper.createPartName(comments.getTargetURI()); PackagePart commentsPart = sheetPkg.getPackage().getPart(commentsName); + if (commentsPart == null) { + LOGGER.warn("Failed to find sheet comments: {}", commentsName); + return null; + } return parseComments(commentsPart); } } catch (InvalidFormatException|IOException e) {