diff --git a/src/x11_init.c b/src/x11_init.c
index 84ecbf52..33ea7baf 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -355,7 +355,8 @@ static void detectEWMH(void)
                                XA_WINDOW,
                                (unsigned char**) &windowFromRoot) != 1)
     {
-        XFree(windowFromRoot);
+        if (windowFromRoot)
+            XFree(windowFromRoot);
         return;
     }
 
@@ -369,13 +370,12 @@ static void detectEWMH(void)
                                (unsigned char**) &windowFromChild) != 1)
     {
         XFree(windowFromRoot);
-        XFree(windowFromChild);
+        if (windowFromChild)
+            XFree(windowFromChild);
         return;
     }
 
     _glfwReleaseXErrorHandler();
-    if (_glfw.x11.errorCode != Success)
-        return;
 
     // It should be the ID of that same child window
     if (*windowFromRoot != *windowFromChild)