diff --git a/ChangeLog b/ChangeLog
index c0ee12a0f2..7f119078b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmain.c (post_parse_hook): 
+	* gdk/gdk.c (gdk_init): Handle display_name being NULL.
+	(#354004, Chris Wilson)
+
 2006-09-01  Abel Cheung  <abel@oaka.org>
 
 	* configure.in: Added 'ang' 'dz' to ALL_LINGUAS.
diff --git a/gdk/gdk.c b/gdk/gdk.c
index a6aec950ae..64be2ff903 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -328,7 +328,8 @@ gdk_init (int *argc, char ***argv)
 {
   if (!gdk_init_check (argc, argv))
     {
-      g_warning ("cannot open display: %s", gdk_get_display_arg_name ());
+      const char *display_name = gdk_get_display_arg_name ();
+      g_warning ("cannot open display: %s", display_name ? display_name : "");
       exit(1);
     }
 }
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 770cbd1700..92af98a25f 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -551,11 +551,12 @@ post_parse_hook (GOptionContext *context,
     {
       if (gdk_display_open_default_libgtk_only () == NULL)
 	{
+	  const char *display_name = gdk_get_display_arg_name ();
 	  g_set_error (error, 
 		       G_OPTION_ERROR, 
 		       G_OPTION_ERROR_FAILED,
 		       "cannot open display: %s",
-		       gdk_get_display_arg_name ());
+		       display_name ? display_name : "" );
 	  
 	  return FALSE;
 	}