From fd4d143d4469f9b611a1c700e3dc121db288fdeb Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Wed, 14 Jan 2026 21:06:26 +0100
Subject: [PATCH] XSSFReader: tolerate missing comments file (#996)

---
 .../org/apache/poi/xssf/eventusermodel/XSSFReader.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

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) {