diff --git a/src/window.c b/src/window.c
index f0f504c5..5ce8cfa0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -523,6 +523,10 @@ GLFWAPI void glfwCloseWindow(GLFWwindow handle)
 
     _GLFWwindow* window = (_GLFWwindow*) handle;
 
+    // Allow closing of NULL (to match the behavior of free)
+    if (window == NULL)
+        return;
+
     // Show mouse pointer again (if hidden)
     if (window == _glfwLibrary.cursorLockWindow)
         glfwEnable(window, GLFW_MOUSE_CURSOR);