diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b9b24d1379..dca1530662 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-29  Pedro Alves  <pedro@codesourcery.com>
+
+	* breakpoint.c (print_exception_catchpoint): Access `b' directly
+	instead of `b->loc->owner'.
+	(print_mention_exception_catchpoint): Ditto.
+
 2009-04-29  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* macrocmd.c (info_macro_command): Print -Dname=value if LINE is zero.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 330a53a66b..c5b93a2a97 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -6631,7 +6631,7 @@ print_exception_catchpoint (struct breakpoint *b)
     breakpoint_adjustment_warning (b->loc->requested_address,
 	                           b->loc->address,
 				   b->number, 1);
-  bp_temp = b->loc->owner->disposition == disp_del;
+  bp_temp = b->disposition == disp_del;
   ui_out_text (uiout, 
 	       bp_temp ? "Temporary catchpoint "
 		       : "Catchpoint ");
@@ -6678,7 +6678,7 @@ print_mention_exception_catchpoint (struct breakpoint *b)
   int bp_temp;
   int bp_throw;
 
-  bp_temp = b->loc->owner->disposition == disp_del;
+  bp_temp = b->disposition == disp_del;
   bp_throw = strstr (b->addr_string, "throw") != NULL;
   ui_out_text (uiout, bp_temp ? _("Temporary catchpoint ")
 			      : _("Catchpoint "));