diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de51252cdf..0cec62b32e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-17  Luis Machado  <luisgpm@br.ibm.com>
+
+        * breakpoint.c (bpstat_stop_status): Check an additional
+        condition before evaluating an expression value.
+
 2007-12-17  Joel Brobecker  <brobecker@adacore.com>
 
 	* language.h (enum exp_opcode): Add forward declaration.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 651ee893c5..44c02f0593 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2823,7 +2823,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, ptid_t ptid)
 	if (b->type == bp_watchpoint_scope)
 	  b->related_breakpoint->watchpoint_triggered = watch_triggered_yes;
 
-	if (bl->cond)
+	if (bl->cond && bl->owner->disposition != disp_del_at_next_stop)
 	  {
 	    /* Need to select the frame, with all that implies
 	       so that the conditions will have the right context.  */