diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aa8a10566f9..2251b08e36f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-13  Tom Tromey  <tromey@redhat.com>
+
+	* python/py-breakpoint.c (gdbpy_breakpoint_deleted): Ensure GIL is
+	always released.
+
 2011-10-13  Tom Tromey  <tromey@redhat.com>
 
 	* python/py-type.c (typy_has_key): Make 'field' const.
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c
index 3dc0fcacbeb..87265e269f3 100644
--- a/gdb/python/py-breakpoint.c
+++ b/gdb/python/py-breakpoint.c
@@ -841,15 +841,15 @@ gdbpy_breakpoint_deleted (struct breakpoint *b)
 
   state = PyGILState_Ensure ();
   bp = get_breakpoint (num);
-  if (! bp)
-    return;
-
-  bp_obj = bp->py_bp_object;
-  if (bp_obj)
+  if (bp)
     {
-      bp_obj->bp = NULL;
-      --bppy_live;
-      Py_DECREF (bp_obj);
+      bp_obj = bp->py_bp_object;
+      if (bp_obj)
+	{
+	  bp_obj->bp = NULL;
+	  --bppy_live;
+	  Py_DECREF (bp_obj);
+	}
     }
   PyGILState_Release (state);
 }