diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8e1bd11a344..f5adaf88cc6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-01  Pedro Alves  <palves@redhat.com>
+
+	* infrun.c (keep_going): Also discard cleanups if inserting
+	breakpoints fails.
+
 2015-04-01  Pedro Alves  <palves@redhat.com>
 
 	* infrun.c (wait_for_inferior): Install the
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 18ce0361b7e..f366a579c61 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -6251,6 +6251,7 @@ keep_going (struct execution_control_state *ecs)
 	{
 	  exception_print (gdb_stderr, e);
 	  stop_waiting (ecs);
+	  discard_cleanups (old_cleanups);
 	  return;
 	}
       END_CATCH