diff --git a/plugins/GSnull/Linux/GSLinux.cpp b/plugins/GSnull/Linux/GSLinux.cpp
index dbf199a26a..af3fd65b7f 100644
--- a/plugins/GSnull/Linux/GSLinux.cpp
+++ b/plugins/GSnull/Linux/GSLinux.cpp
@@ -46,7 +46,8 @@ int GSOpenWindow2(void *pDsp, u32 flags)
 
 void GSCloseWindow()
 {
-	XCloseDisplay(display);
+    if (display != NULL)
+        XCloseDisplay(display);
 }
 
 void GSProcessMessages()