diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java index ab230580a..7eb3af283 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java @@ -421,8 +421,11 @@ public final class Picture if ( escherRecord instanceof EscherBSERecord ) { - return ( (EscherBSERecord) escherRecord ).getBlipRecord() - .getPicturedata(); + EscherBlipRecord blip = ( (EscherBSERecord) escherRecord ).getBlipRecord(); + if (blip != null) { + return blip.getPicturedata(); + + } } return new byte[0]; }