diff --git a/src/r600_exa.c b/src/r600_exa.c
index 22e554d..02304f4 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -1055,6 +1055,9 @@ static Bool R600CheckCompositeTexture(PicturePtr pPict,
     max_tex_w = 8192;
     max_tex_h = 8192;
 
+    if ((w == 0) || (h == 0))
+	RADEON_FALLBACK(("Picture w/h zero (%dx%d)\n", w, h));
+
     if ((w > max_tex_w) || (h > max_tex_h))
 	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
 
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 571204a..8bf9ffd 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -326,6 +326,9 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict, int unit)
     int h = pPict->pDrawable->height;
     int i;
 
+    if ((w == 0) || (h == 0))
+	RADEON_FALLBACK(("Picture w/h zero (%dx%d)\n", w, h));
+
     /* r100 limit should be 2048, there are issues with 2048
      * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
      */
@@ -663,6 +666,9 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict, int unit)
     int h = pPict->pDrawable->height;
     int i;
 
+    if ((w == 0) || (h == 0))
+	RADEON_FALLBACK(("Picture w/h zero (%dx%d)\n", w, h));
+
     /* r200 limit should be 2048, there are issues with 2048
      * see bug 19269
      */
@@ -1004,6 +1010,9 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
 	max_tex_h = 2048;
     }
 
+    if ((w == 0) || (h == 0))
+	RADEON_FALLBACK(("Picture w/h zero (%dx%d)\n", w, h));
+
     if ((w > max_tex_w) || (h > max_tex_h))
 	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));