diff --git a/ChangeLog b/ChangeLog
index 86653d3b07e9c5b352fd2570889a4e6d678a4b09..a1abeeceaa1f12c63b38f54e86d0bb7beff92a80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-07  Christian Neumair  <cneumair@gnome.org>
+
+	* libnautilus-private/nautilus-metafile.c: (metafile_read_state_free):
+	Handle NULL state (#512042).
+	* src/nautilus-pathbar.c: (nautilus_path_bar_finalize): Disconnect
+	trash monitor signal (#519050).
+
 2008-02-26  Alexander Larsson  <alexl@redhat.com>
 
 	* src/nautilus-autorun-software.c (autorun):
diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c
index 6797626ac3561f727e32f998f6822a071dc2c294..da77f7728531174cce891b3024e64ed42261e767 100644
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@@ -1723,6 +1723,10 @@ metafile_read_cancel (NautilusMetafile *metafile)
 static void
 metafile_read_state_free (MetafileReadState *state)
 {
+	if (state == NULL) {
+		return;
+	}
+
 	g_object_unref (state->cancellable);
 	g_free (state);
 }
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index c6ceb819f807c3f3ae49a3a29b9092c264733887..7195a404bdf9a573f7d7f17d56d4d0fb7f65b6c3 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -338,6 +338,9 @@ nautilus_path_bar_finalize (GObject *object)
 		path_bar->desktop_icon = NULL;
 	}
 
+	g_signal_disconnect_by_func (nautilus_trash_monitor_get (),
+				     trash_state_changed_cb, path_bar);
+
         G_OBJECT_CLASS (nautilus_path_bar_parent_class)->finalize (object);
 }