diff --git a/src/java/org/lwjgl/opengl/Display.java b/src/java/org/lwjgl/opengl/Display.java
index 23d54d98..9a5c1133 100644
--- a/src/java/org/lwjgl/opengl/Display.java
+++ b/src/java/org/lwjgl/opengl/Display.java
@@ -277,7 +277,7 @@ public final class Display {
 			return;
 		}
 		try {
-			if (context.isCurrent()) {
+			if (context != null && context.isCurrent()) {
 				context.releaseDrawable();
 				Context.releaseCurrentContext();
 			}