diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphics.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphics.java
index ecfe21f544..14436d1ba5 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphics.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphics.java
@@ -629,7 +629,7 @@ public class HwmfGraphics implements HwmfCharsetAware {
         }
 
         FontCharset fc = font.getCharset();
-        if (fc == FontCharset.DEFAULT) {
+        if (fc == FontCharset.DEFAULT || fc == null) {
             return charsetProvider.get();
         }
 
diff --git a/test-data/slideshow/npe.ppt b/test-data/slideshow/npe.ppt
new file mode 100644
index 0000000000..95703025cc
Binary files /dev/null and b/test-data/slideshow/npe.ppt differ