diff --git a/src/java/org/lwjgl/opengl/GLContext.java b/src/java/org/lwjgl/opengl/GLContext.java
index 953faa04..6c80a983 100644
--- a/src/java/org/lwjgl/opengl/GLContext.java
+++ b/src/java/org/lwjgl/opengl/GLContext.java
@@ -330,8 +330,11 @@ public final class GLContext {
 
 	private static void unloadStubs() {
 		Iterator exts_it = exts.keySet().iterator();
-		while (exts_it.hasNext())
-			resetNativeStubs((Class)exts_it.next());
+		while (exts_it.hasNext()) {
+			Class ext_class = (Class)exts_it.next();
+			resetNativeStubs(ext_class);
+		}
+		resetNativeStubs(org.lwjgl.opengl.GL11.class);
 	}
 
 	/**
diff --git a/src/native/win32/org_lwjgl_opengl_Display.cpp b/src/native/win32/org_lwjgl_opengl_Display.cpp
index 80b2267b..a14a3a0a 100644
--- a/src/native/win32/org_lwjgl_opengl_Display.cpp
+++ b/src/native/win32/org_lwjgl_opengl_Display.cpp
@@ -561,7 +561,9 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Display_nSetVSyncEnabled
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Display_nMakeCurrent
   (JNIEnv *env, jclass clazz)
 {
-	wglMakeCurrent(hdc, hglrc);
+	BOOL result = wglMakeCurrent(hdc, hglrc);
+	if (!result)
+		throwException(env, "Could not make display context current");
 }
 
 /*
diff --git a/src/native/win32/org_lwjgl_opengl_Pbuffer.cpp b/src/native/win32/org_lwjgl_opengl_Pbuffer.cpp
index e6a6e340..482b78f4 100755
--- a/src/native/win32/org_lwjgl_opengl_Pbuffer.cpp
+++ b/src/native/win32/org_lwjgl_opengl_Pbuffer.cpp
@@ -174,7 +174,8 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Pbuffer_nMakeCurrent
   (JNIEnv *env, jclass clazz, jint handle)
 {
 	PbufferInfo *Pbuffer_info = (PbufferInfo *)handle;
-	wglMakeCurrent(Pbuffer_info->Pbuffer_dc, Pbuffer_info->Pbuffer_context);
+	if (!wglMakeCurrent(Pbuffer_info->Pbuffer_dc, Pbuffer_info->Pbuffer_context))
+		throwException(env, "Could not make pbuffer context current");
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Pbuffer_nDestroy