diff --git a/poi/src/main/java/org/apache/poi/hpsf/PropertySetFactory.java b/poi/src/main/java/org/apache/poi/hpsf/PropertySetFactory.java
index 350e3e605b..b08b68dfe1 100644
--- a/poi/src/main/java/org/apache/poi/hpsf/PropertySetFactory.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/PropertySetFactory.java
@@ -87,7 +87,9 @@ public class PropertySetFactory {
         if (byteOrder != PropertySet.BYTE_ORDER_ASSERTION ||
             format != PropertySet.FORMAT_ASSERTION ||
             sectionCount < 0) {
-            throw new NoPropertySetStreamException();
+            throw new NoPropertySetStreamException("ByteOrder: " + byteOrder +
+                    ", format: " + format +
+                    ", sectionCount: " + sectionCount);
         }
 
         if (sectionCount > 0) {