diff --git a/strip-frames.xsl b/strip-frames.xsl
index 655203fc24a82229f44f66f1196b48a8b6f94959..8e39c3f4689cfe4fc5d22bdc9c8d37cdd0fe395c 100644
--- a/strip-frames.xsl
+++ b/strip-frames.xsl
@@ -107,9 +107,9 @@
 <!-- companion for the above, catches frames not handled because outside of
      supported elements.  Should never happen, but helps debugging of unexpected
      cases. -->
-<xsl:template match="*[not(self::text:p)]/draw:frame[count(draw:text-box) = count(*)]">
-  <xsl:message>Unsupported input with a draw:frame not inside a text:p but with draw:text-box children</xsl:message>
-  <xsl:comment>Unsupported input with a draw:frame not inside a text:p but with draw:text-box children</xsl:comment>
+<xsl:template match="*[not(self::text:p)][draw:frame[count(draw:text-box) = count(*)]]">
+  <xsl:message>Unsupported input with a draw:frame not inside a text:p (but a <xsl:value-of select="name()"/>) but with draw:text-box children</xsl:message>
+  <xsl:comment>Unsupported input with a draw:frame not inside a text:p (but a <xsl:value-of select="name()"/>) but with draw:text-box children</xsl:comment>
   <xsl:call-template name="copy-and-recurse"/>
 </xsl:template>