diff --git a/gio/ChangeLog b/gio/ChangeLog
index 36d786eac..5a7eb9543 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-30  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 545457 – gdmsetup crashed with SIGSEGV in
+	g_unix_mount_guess_should_display()
+
+	* gunixvolumemonitor.c (get_mount_for_mount_path): Don't 
+	crash if no mount is found.
+
 2008-07-28  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 545203 – gfile.c: argument is different type.
diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c
index cbf5b8345..6fd389e5d 100644
--- a/gio/gunixvolumemonitor.c
+++ b/gio/gunixvolumemonitor.c
@@ -150,7 +150,10 @@ get_mount_for_mount_path (const char *mount_path,
   GUnixMount *mount;
 
   mount_entry = g_unix_mount_at (mount_path, NULL);
-  
+
+  if (!mount_entry)
+    return NULL;
+
   /* TODO: Set mountable volume? */
   mount = _g_unix_mount_new (NULL, mount_entry, NULL);