diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 08f247c1fb..1f07f38cc5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-30  Tom Tromey  <tromey@redhat.com>
+
+	* python/py-value.c (valpy_binop): Call do_cleanups before
+	exiting loop.
+
 2013-05-30  Tom Tromey  <tromey@redhat.com>
 
 	* python/py-prettyprint.c (print_children): Remove extra
diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index 0b2a38fa40..0d87219ae8 100644
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -769,11 +769,17 @@ valpy_binop (enum valpy_opcode opcode, PyObject *self, PyObject *other)
 	 a gdb.Value object and need to convert it from python as well.  */
       arg1 = convert_value_from_python (self);
       if (arg1 == NULL)
-	break;
+	{
+	  do_cleanups (cleanup);
+	  break;
+	}
 
       arg2 = convert_value_from_python (other);
       if (arg2 == NULL)
-	break;
+	{
+	  do_cleanups (cleanup);
+	  break;
+	}
 
       switch (opcode)
 	{