diff --git a/modules/other/gail/ChangeLog b/modules/other/gail/ChangeLog
index 75e0472157..ee0ebb8116 100644
--- a/modules/other/gail/ChangeLog
+++ b/modules/other/gail/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-21  Li Yuan  <li.yuan@sun.com>
+
+	* gailtreeview.c: (traverse_cells):
+	Bug #548783. Change g_assert to g_return_if_fail to avoid
+	unnucessary crash.
+
 2008-08-21  Li Yuan  <li.yuan@sun.com>
 
 	* gailtreeview.c: (model_row_deleted):
diff --git a/modules/other/gail/gailtreeview.c b/modules/other/gail/gailtreeview.c
index b6a9af6fd4..4e5e338d25 100644
--- a/modules/other/gail/gailtreeview.c
+++ b/modules/other/gail/gailtreeview.c
@@ -3748,7 +3748,7 @@ traverse_cells (GailTreeView *tree_view,
 	  if (cell_info->in_use)
 	  {
 	      row_path = gtk_tree_row_reference_get_path (cell_info->cell_row_ref);
-	      g_assert (row_path != NULL);
+	      g_return_if_fail (row_path != NULL);
 	      if (tree_path == NULL)
 		  act_on_cell = TRUE;
 	      else