diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp
index e130a970a4..58a3658c7c 100644
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -321,25 +321,28 @@ bool wxGLCanvas::Create(wxWindow *parent,
         glVersionMinor = 0;
 
     // Check for a core profile request
-    for ( int i = 0; attribList[i]; )
+    if ( attribList )
     {
-        switch ( attribList[i++] )
+        for ( int i = 0; attribList[i]; )
         {
-            case WX_GL_CORE_PROFILE:
-                useGLCoreProfile = true;
-                break;
+            switch ( attribList[i++] )
+            {
+                case WX_GL_CORE_PROFILE:
+                    useGLCoreProfile = true;
+                    break;
 
-            case WX_GL_MAJOR_VERSION:
-                glVersionMajor = attribList[i++];
-                break;
+                case WX_GL_MAJOR_VERSION:
+                    glVersionMajor = attribList[i++];
+                    break;
 
-            case WX_GL_MINOR_VERSION:
-                glVersionMinor = attribList[i++];
-                break;
+                case WX_GL_MINOR_VERSION:
+                    glVersionMinor = attribList[i++];
+                    break;
 
-            default:
-                // ignore all other flags for now
-                break;
+                default:
+                    // ignore all other flags for now
+                    break;
+            }
         }
     }