diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d7d71fde57..077528a1ed 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-16  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* infcmd.c (show_inferior_tty_command): Check for NULL.
+	Correct output message.
+
 2010-02-16  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* linespec.c (decode_line_1): Handle FILE:FUNCTION even if
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index f99a4aed96..29cf427831 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -197,10 +197,12 @@ show_inferior_tty_command (struct ui_file *file, int from_tty,
 {
   /* Note that we ignore the passed-in value in favor of computing it
      directly.  */
+  const char *inferior_io_terminal = get_inferior_io_terminal ();
+  if (inferior_io_terminal == NULL)
+    inferior_io_terminal = "";
   fprintf_filtered (gdb_stdout,
-		    _("argument list to give program being debugged when "
-		      "it is started is %s"),
-		    get_inferior_io_terminal ());
+		    _("Terminal for future runs of program being debugged "
+		      "is \"%s\".\n"), inferior_io_terminal);
 }
 
 char *