diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d1981d8559..de0ccf23df 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-10  Steve Ellcey  <sje@cup.hp.com>
+
+	* hppa-hpux-tdep.c (initialize_hp_cxx_exception_support): Remove
+	message.
+
 2006-05-09  Andreas Schwab  <schwab@suse.de>
 
 	* dwarf2-frame.c (struct dwarf2_fde): Add eh_frame_p.
diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c
index 7eba12344a..b434584b15 100644
--- a/gdb/hppa-hpux-tdep.c
+++ b/gdb/hppa-hpux-tdep.c
@@ -865,14 +865,14 @@ GDB will be unable to intercept exception events."),
            does the equivalent of shl_findsym()) to find the plabel.  */
 
         args_for_find_stub args;
-        static char message[] = _("Error while finding exception callback hook:\n");
 
         args.solib_handle = gdbarch_tdep (current_gdbarch)->solib_get_solib_by_pc (eh_notify_callback_addr);
         args.msym = msym;
         args.return_val = 0;
 
         recurse++;
-        catch_errors (cover_find_stub_with_shl_get, &args, message,
+        catch_errors (cover_find_stub_with_shl_get, &args,
+		      _("Error while finding exception callback hook:\n"),
 		      RETURN_MASK_ALL);
         eh_notify_callback_addr = args.return_val;
         recurse--;