diff -urNp anjuta-2.24.2.orig/plugins/file-manager/file-model.c anjuta-2.24.2/plugins/file-manager/file-model.c
--- anjuta-2.24.2.orig/plugins/file-manager/file-model.c	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/file-manager/file-model.c	2009-03-17 00:19:42.000000000 +0530
@@ -106,28 +106,6 @@ file_model_add_dummy (FileModel* model,
 }
 
 static void
-file_model_remove_file (FileModel* model, 
-						GtkTreeIter* iter)
-{
-	GFile* file;
-	GtkTreeRowReference* reference;
-	GFileMonitor* monitor;
-	
-	gtk_tree_model_get (GTK_TREE_MODEL (model), iter,
-						COLUMN_FILE, &file, -1);
-	
-	monitor = g_object_get_data (G_OBJECT(file), "file-monitor");
-	if (monitor)
-		g_object_unref (monitor);
-	
-	reference = g_object_get_data (G_OBJECT(file), "reference");
-	if (reference)
-		gtk_tree_row_reference_free(reference);
-	
-	gtk_tree_store_remove (GTK_TREE_STORE (model), iter);	
-}
-
-static void
 file_model_update_file (FileModel* model,
 						GtkTreeIter* iter,
 						GFile* file,
@@ -201,6 +179,7 @@ on_file_model_changed (GFileMonitor* mon
 	GtkTreeIter file_iter;
 	gboolean found = FALSE;
 	
+	/* reference could be invalid if the file has already been destroyed */
 	if (!gtk_tree_row_reference_valid(reference))
 		return;
 	
@@ -255,7 +234,7 @@ on_file_model_changed (GFileMonitor* mon
 		}
 		case G_FILE_MONITOR_EVENT_DELETED:
 		{
-			file_model_remove_file (model, &file_iter);
+			gtk_tree_store_remove (GTK_TREE_STORE (model), &file_iter);
 			break;
 		}
 		default:
@@ -285,8 +264,9 @@ file_model_add_watch (FileModel* model, 
 	g_signal_connect (monitor, "changed", G_CALLBACK(on_file_model_changed),
 					  reference);
 	
-	g_object_set_data (G_OBJECT(file), "file-monitor", monitor);
-	g_object_set_data (G_OBJECT(file), "reference", reference);	
+	g_object_set_data_full (G_OBJECT(file), "file-monitor", monitor, (GDestroyNotify)g_object_unref);
+	/* Reference is used by monitor, should be kept it until the monitor is destroyed */
+	g_object_set_data_full (G_OBJECT(monitor), "reference", reference, (GDestroyNotify)gtk_tree_row_reference_free);
 	g_object_unref (file);
 }
 
@@ -355,7 +335,7 @@ file_model_row_collapsed (GtkTreeView* t
 
 	while (gtk_tree_model_iter_children (GTK_TREE_MODEL(model), &child, &real_iter))
 	{
-		file_model_remove_file (model, &child);
+		gtk_tree_store_remove (GTK_TREE_STORE (model), &child);
 	}
 	
 	file_model_add_dummy (model, &real_iter);
diff -urNp anjuta-2.24.2.orig/plugins/file-manager/plugin.c anjuta-2.24.2/plugins/file-manager/plugin.c
--- anjuta-2.24.2.orig/plugins/file-manager/plugin.c	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/file-manager/plugin.c	2009-03-17 00:03:40.000000000 +0530
@@ -131,6 +131,7 @@ on_file_view_current_file_changed (Anjut
 		g_value_set_object (value, file);
 		anjuta_shell_add_value (ANJUTA_PLUGIN (file_manager)->shell,
 								IANJUTA_FILE_MANAGER_SELECTED_FILE, value, NULL);
+		g_value_unset (value);
 	}
 	else
 	{