diff --git a/src/java/org/lwjgl/opengl/MacOSXDisplay.java b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
index 0a795ae3..eaefb87a 100644
--- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java
+++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
@@ -34,7 +34,7 @@ package org.lwjgl.opengl;
 /**
  * This is the Display implementation interface. Display delegates
  * to implementors of this interface. There is one DisplayImplementation
- * for each supported platform. Git test
+ * for each supported platform.
  * @author elias_naur
  */
 
diff --git a/src/native/macosx/org_lwjgl_opengl_Display.m b/src/native/macosx/org_lwjgl_opengl_Display.m
index 2255ffd1..3697217c 100644
--- a/src/native/macosx/org_lwjgl_opengl_Display.m
+++ b/src/native/macosx/org_lwjgl_opengl_Display.m
@@ -139,7 +139,7 @@ static NSAutoreleasePool *pool;
     NSOpenGLContext* context = [self openGLContext];
     
     [super lockFocus];
-    if ([context view] != self) {
+    if ([context view] != self && [context view] != nil) {
         [context setView:self];
     }