diff --git a/src/java/org/lwjgl/opengl/Display.java b/src/java/org/lwjgl/opengl/Display.java
index c6317a45..eb4b9a10 100644
--- a/src/java/org/lwjgl/opengl/Display.java
+++ b/src/java/org/lwjgl/opengl/Display.java
@@ -637,7 +637,8 @@ public final class Display {
 			if ( !isCreated() )
 				throw new IllegalStateException("Display not created");
 
-			Util.checkGLError();
+			if ( LWJGLUtil.DEBUG )
+				Util.checkGLError();
 			Context.swapBuffers();
 		}
 	}
diff --git a/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java b/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
index 0df08f1a..f3e4cedb 100644
--- a/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
+++ b/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
@@ -118,6 +118,7 @@ public class ContextCapabilitiesGenerator {
 		writer.println("\tprivate Set " + ALL_INIT_METHOD_NAME + "(boolean forwardCompatible) throws LWJGLException {");
 
 		// Load the basic pointers we need to detect OpenGL version and supported extensions.
+		writer.println("\t\tGL11_glGetError_pointer = GLContext.getFunctionAddress(\"glGetError\");");
 		writer.println("\t\tGL11_glGetString_pointer = GLContext.getFunctionAddress(\"glGetString\");");
 
 		// Initialize GL11.glGetIntegerv and GL30.glGetStringi here, in case we have created an OpenGL 3.0 context.