diff --git a/src/native/win32/org_lwjgl_Window.cpp b/src/native/win32/org_lwjgl_Window.cpp
index 02501c6a..f814c950 100644
--- a/src/native/win32/org_lwjgl_Window.cpp
+++ b/src/native/win32/org_lwjgl_Window.cpp
@@ -386,6 +386,8 @@ void handleMessages(JNIEnv * env, jobject obj)
 		TranslateMessage(&msg);
       	DispatchMessage(&msg);
 	};
+	environment = NULL;
+	window = NULL;
 }
 
 /*