diff --git a/glx/glxdri.c b/glx/glxdri.c
index 090e7ef..6af0321 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -742,7 +742,7 @@ getDrawableInfo(__DRIdrawable *driDrawable,
     size_t size;
 
     /* If the X window has been destroyed, give up here. */
-    if (drawable->base.pDraw == NULL)
+    if (drawable->base.pDraw == NULL || drawable-base.pDraw->pScreen == NULL)
 	return GL_FALSE;
 
     pScreen = drawable->base.pDraw->pScreen;