diff --git a/src/opengl.c b/src/opengl.c
index 8437fe38..d75eee8f 100644
--- a/src/opengl.c
+++ b/src/opengl.c
@@ -411,14 +411,8 @@ GLboolean _glfwIsValidContext(_GLFWwindow* window, _GLFWwndconfig* wndconfig)
         window->GetStringi = (PFNGLGETSTRINGIPROC) glfwGetProcAddress("glGetStringi");
         if (!window->GetStringi)
         {
-            // This is a very common problem among people who compile GLFW
-            // on X11/GLX using custom build systems, as it needs explicit
-            // configuration in order to work
-
             _glfwSetError(GLFW_PLATFORM_ERROR,
-                          "glfwOpenWindow: Entry point retrieval is broken "
-                          "because GLFW was incorrectly compiled; "
-                          "see the build documentation for your platform");
+                          "glfwOpenWindow: Entry point retrieval is broken");
             return GL_FALSE;
         }
     }
diff --git a/src/x11_opengl.c b/src/x11_opengl.c
index a261d616..4075a7c0 100644
--- a/src/x11_opengl.c
+++ b/src/x11_opengl.c
@@ -38,7 +38,7 @@ void (*glXGetProcAddressEXT(const GLubyte* procName))();
 // We support four different ways for getting addresses for GL/GLX
 // extension functions: glXGetProcAddress, glXGetProcAddressARB,
 // glXGetProcAddressEXT, and dlsym
-#if   defined(_GLFW_HAS_GLXGETPROCADDRESSARB)
+#if defined(_GLFW_HAS_GLXGETPROCADDRESSARB)
  #define _glfw_glXGetProcAddress(x) glXGetProcAddressARB(x)
 #elif defined(_GLFW_HAS_GLXGETPROCADDRESS)
  #define _glfw_glXGetProcAddress(x) glXGetProcAddress(x)
@@ -48,7 +48,7 @@ void (*glXGetProcAddressEXT(const GLubyte* procName))();
  #define _glfw_glXGetProcAddress(x) dlsym(_glfwLibrary.X11.libGL, x)
  #define _GLFW_DLOPEN_LIBGL
 #else
-#define _glfw_glXGetProcAddress(x) NULL
+ #error "No OpenGL entry point retrieval mechanism was enabled"
 #endif