diff --git a/gio/ChangeLog b/gio/ChangeLog
index 8e8733aca..9681f5377 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-04  Tor Lillqvist  <tml@novell.com>
+
+	* gwin32mount.c (g_win32_mount_finalize): Don't unref icon if
+	NULL.
+
 2008-09-02  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.18.0 ===
diff --git a/gio/gwin32mount.c b/gio/gwin32mount.c
index 511bd763d..98ae45e29 100644
--- a/gio/gwin32mount.c
+++ b/gio/gwin32mount.c
@@ -80,7 +80,10 @@ g_win32_mount_finalize (GObject *object)
     _g_win32_volume_unset_mount (mount->volume, mount);
 #endif
   /* TODO: g_warn_if_fail (volume->volume == NULL); */
-  g_object_unref (mount->icon);
+
+  if (mount->icon != NULL)
+    g_object_unref (mount->icon);
+
   g_free (mount->name);
   g_free (mount->mount_path);