Index: gmessages.c
===================================================================
RCS file: /cvs/gnome/glib/glib/gmessages.c,v
retrieving revision 1.47
diff -u -r1.47 gmessages.c
--- gmessages.c	28 Mar 2002 23:24:21 -0000	1.47
+++ gmessages.c	22 Apr 2002 06:00:15 -0000
@@ -771,7 +771,7 @@
       else
 	{
 	  string = strdup_convert (message, charset);
-	  g_string_append (gstring, string);
+	  g_string_append (gstring, string ? string : "(Cannot display message: error in charset conversion)");
 	  g_free (string);
 	}
     }
