diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 28d5a3a9c..6887e199c 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -440,8 +440,8 @@ create_driver_context(__GLXDRIcontext * context,
                       const uint32_t *attribs,
                       int *error)
 {
-    context->driContext = NULL;
     const __DRIconfig *driConfig = config ? config->driConfig : NULL;
+    context->driContext = NULL;
 
     if (screen->dri2->base.version >= 3) {
         uint32_t ctx_attribs[4 * 2];