diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
index da377e7ab9..e5207093ff 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
@@ -268,7 +268,7 @@ public final class XSSFPicture extends XSSFShape implements Picture {
      */
     @Override
     public XSSFPictureData getPictureData() {
-        if (ctPicture.getBlipFill().getBlip() == null) {
+        if (ctPicture.getBlipFill() == null || ctPicture.getBlipFill().getBlip() == null) {
             return null;
         }
 
diff --git a/test-data/spreadsheet/npe.xlsx b/test-data/spreadsheet/npe.xlsx
new file mode 100644
index 0000000000..ae768405c5
Binary files /dev/null and b/test-data/spreadsheet/npe.xlsx differ