diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8fda4dd4f68..85ba233991b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-06  Wu Zhou  <woodzltc@cn.ibm.com>
+
+	* tui/tui-win.c (parse_scrolling_args): Fix SEGV error with invalid
+	scroll command.
+
 2005-07-06  Wu Zhou  <woodzltc@cn.ibm.com>
 
 	* f-exp.y (yyparse): Add code to support exponentiation expression.
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index d7dd070003d..cdd2550d2ce 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -1543,7 +1543,7 @@ parse_scrolling_args (char *arg, struct tui_win_info * * win_to_scroll,
 
 	  if (*win_to_scroll == (struct tui_win_info *) NULL ||
 	      !(*win_to_scroll)->generic.is_visible)
-	    warning (_("Invalid window specified. \n\
+	    error (_("Invalid window specified. \n\
 The window name specified must be valid and visible.\n"));
 	  else if (*win_to_scroll == TUI_CMD_WIN)
 	    *win_to_scroll = (struct tui_win_info *) (tui_source_windows ())->list[0];