diff --git a/ChangeLog b/ChangeLog
index 018a02d18d..f0281b67c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfontbutton.c (gtk_font_button_update_font_info): Avoid
+	a crash if the font doesn't exist.  (#144967, Yevgen Muntyan) 
+
 Fri Jun 25 00:32:15 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktreestore.c (gtk_tree_store_swap): Commit the change
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 018a02d18d..f0281b67c6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-06-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfontbutton.c (gtk_font_button_update_font_info): Avoid
+	a crash if the font doesn't exist.  (#144967, Yevgen Muntyan) 
+
 Fri Jun 25 00:32:15 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktreestore.c (gtk_tree_store_swap): Commit the change
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 018a02d18d..f0281b67c6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-06-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfontbutton.c (gtk_font_button_update_font_info): Avoid
+	a crash if the font doesn't exist.  (#144967, Yevgen Muntyan) 
+
 Fri Jun 25 00:32:15 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktreestore.c (gtk_tree_store_swap): Commit the change
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 018a02d18d..f0281b67c6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-06-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfontbutton.c (gtk_font_button_update_font_info): Avoid
+	a crash if the font doesn't exist.  (#144967, Yevgen Muntyan) 
+
 Fri Jun 25 00:32:15 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktreestore.c (gtk_tree_store_swap): Commit the change
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 53eb5cf5a9..34e8c2688c 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -878,9 +878,10 @@ gtk_font_button_update_font_info (GtkFontButton *font_button)
       gint n_families, n_faces, i;
 
       n_families = 0;
-      n_faces = 0;
       pango_context_list_families (gtk_widget_get_pango_context (GTK_WIDGET (font_button)),
                                    &families, &n_families);
+      n_faces = 0;
+      faces = NULL;
       for (i = 0; i < n_families; i++) 
         {
           const gchar *name = pango_font_family_get_name (families[i]);