diff --git a/doc/tutorial/skeleton_code.html b/doc/tutorial/skeleton_code.html
index 2f21c08d..5a40765e 100644
--- a/doc/tutorial/skeleton_code.html
+++ b/doc/tutorial/skeleton_code.html
@@ -178,6 +178,7 @@ System.out.println(modes[i]);<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; System.exit(1);<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }<br>
 &nbsp;&nbsp;&nbsp; }<br>
+&nbsp;&nbsp;&nbsp; public static final GLU glu = new GLU(gl);<br>
 <br>
 &nbsp;&nbsp;&nbsp; /** Is the game finished? */<br>
 &nbsp;&nbsp;&nbsp; private static boolean finished;<br>
diff --git a/src/java/org/lwjgl/opengl/GL.java b/src/java/org/lwjgl/opengl/GL.java
index e1167d8a..44e4f3f6 100644
--- a/src/java/org/lwjgl/opengl/GL.java
+++ b/src/java/org/lwjgl/opengl/GL.java
@@ -1547,7 +1547,7 @@ public class GL extends CoreGL implements GLConstants {
 				map.put(fields[i].getName(), fields[i]);
 		}
 		
-		String exts = wglGetExtensionsStringEXT();
+		String exts = getString(EXTENSIONS);
 		StringTokenizer st = new StringTokenizer(exts);
 		while (st.hasMoreTokens()) {
 			String ext = st.nextToken();
@@ -1622,6 +1622,9 @@ public class GL extends CoreGL implements GLConstants {
 			exts = wglGetExtensionsStringARB(Display.getHandle()); // Remember - this is an HWND not an HDC, which is what's required
 		else
 			exts = wglGetExtensionsStringEXT();
+			
+		if (exts == null)
+			return;
 
 		System.out.println("Available WGL extensions:");			
 		StringTokenizer st = new StringTokenizer(exts);