diff --git a/ChangeLog b/ChangeLog
index 805df7d29..572944b17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-26  Elijah Newren  <newren gmail com>
+
+	* src/display.c (meta_display_close): Fix a crash on exit/logout
+	from assuming a compositor would always exist
+
 2006-05-25  Elijah Newren  <newren gmail com>
 
 	* src/place.h:
diff --git a/src/display.c b/src/display.c
index 63147a8b5..cf02a9e20 100644
--- a/src/display.c
+++ b/src/display.c
@@ -900,7 +900,8 @@ meta_display_close (MetaDisplay *display)
 
   meta_display_shutdown_keys (display);
 
-  meta_compositor_unref (display->compositor);
+  if (display->compositor)
+    meta_compositor_unref (display->compositor);
   
   g_free (display);