diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b03445067f..15a7b6af2b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-25  Tom Tromey  <tromey@redhat.com>
+
+	* breakpoint.c (bpstat_stop_status): Check 'breakpoint_at' before
+	dereferencing.
+
 2012-01-24  Tom Tromey  <tromey@redhat.com>
 
 	PR symtab/12406:
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 0da099be31..ec7f348d26 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4303,7 +4303,7 @@ bpstat_stop_status (struct address_space *aspace,
      "catch unload".  */
   for (bs = bs_head; bs != NULL; bs = bs->next)
     {
-      if (bs->breakpoint_at->type == bp_shlib_event)
+      if (bs->breakpoint_at && bs->breakpoint_at->type == bp_shlib_event)
 	{
 	  handle_solib_event ();
 	  break;