diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java
index 827ffcf8f..710742473 100644
--- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java
+++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java
@@ -1004,8 +1004,13 @@ public class GLFW
 
 	public static void glfwDestroyWindow(long window) {
         // Check window exists
-        internalGetWindow(window);
-        mGLFWWindowMap.remove(window);
+        try {
+            internalGetWindow(window);
+            mGLFWWindowMap.remove(window);
+        } catch (IllegalArgumentException e) {
+            System.out.println("GLFW: Warning: failed to remove window " + window);
+            e.printStackTrace();
+        }
         nglfwSetShowingWindow(mGLFWWindowMap.size() == 0 ? 0 : mGLFWWindowMap.keyAt(mGLFWWindowMap.size() - 1));
     }