diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index bb3fc894033..077398fe33f 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -348,7 +348,8 @@ static void FreeScreenConfigs(__GLXdisplayPrivate *priv)
 	Xfree((char*) psc->serverGLXexts);
 
 #ifdef GLX_DIRECT_RENDERING
-	psc->driScreen->destroyScreen(psc);
+	if (psc->driScreen)
+	    psc->driScreen->destroyScreen(psc);
 #endif
     }
     XFree((char*) priv->screenConfigs);