diff --git a/hw/xgl/xglpict.c b/hw/xgl/xglpict.c
index 62004f0c6..96f70c478 100644
--- a/hw/xgl/xglpict.c
+++ b/hw/xgl/xglpict.c
@@ -69,10 +69,13 @@ xglComposite (CARD8	 op,
     
     pPictureScreen = GetPictureScreen (pScreen);
 
-    if (!xglSyncBits (pSrc->pDrawable, NullBox))
-	FatalError (XGL_SW_FAILURE_STRING);
+    if (pSrc->pDrawable)
+    {
+	if (!xglSyncBits (pSrc->pDrawable, NullBox))
+	    FatalError (XGL_SW_FAILURE_STRING);
+    }
     
-    if (pMask)
+    if (pMask && pMask->pDrawable)
     {
 	if (!xglSyncBits (pMask->pDrawable, NullBox))
 	    FatalError (XGL_SW_FAILURE_STRING);