diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9d1b1ab7d16..15c59b2de96 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2018-12-27  Tom Tromey  <tom@tromey.com>
+
+	* python/py-value.c (convert_value_from_python): Use
+	gdbpy_convert_exception.
+	* python/py-param.c (parmpy_init): Use gdbpy_convert_exception.
+	* python/py-cmd.c (cmdpy_init): Use gdbpy_convert_exception.
+	* python/py-breakpoint.c (bppy_init): Use
+	gdbpy_convert_exception.
+
 2018-12-27  Tom Tromey  <tom@tromey.com>
 
 	* configure.nat (NATDEPFILES): Use nat/ prefix.
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c
index d144bcf2e6f..29f67615548 100644
--- a/gdb/python/py-breakpoint.c
+++ b/gdb/python/py-breakpoint.c
@@ -874,9 +874,7 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs)
   CATCH (except, RETURN_MASK_ALL)
     {
       bppy_pending_object = NULL;
-      PyErr_Format (except.reason == RETURN_QUIT
-		    ? PyExc_KeyboardInterrupt : PyExc_RuntimeError,
-		    "%s", except.message);
+      gdbpy_convert_exception (except);
       return -1;
     }
   END_CATCH
diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c
index 0e39730a4c0..8fca90efe2a 100644
--- a/gdb/python/py-cmd.c
+++ b/gdb/python/py-cmd.c
@@ -579,9 +579,7 @@ cmdpy_init (PyObject *self, PyObject *args, PyObject *kw)
       xfree (docstring);
       xfree (pfx_name);
       Py_DECREF (self);
-      PyErr_Format (except.reason == RETURN_QUIT
-		    ? PyExc_KeyboardInterrupt : PyExc_RuntimeError,
-		    "%s", except.message);
+      gdbpy_convert_exception (except);
       return -1;
     }
   END_CATCH
diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c
index bff5d60fc26..f8b151f0984 100644
--- a/gdb/python/py-param.c
+++ b/gdb/python/py-param.c
@@ -738,9 +738,7 @@ parmpy_init (PyObject *self, PyObject *args, PyObject *kwds)
     {
       xfree (cmd_name);
       Py_DECREF (self);
-      PyErr_Format (except.reason == RETURN_QUIT
-		    ? PyExc_KeyboardInterrupt : PyExc_RuntimeError,
-		    "%s", except.message);
+      gdbpy_convert_exception (except);
       return -1;
     }
   END_CATCH
diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index d21c2faf64a..430415b2f9b 100644
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -1732,9 +1732,7 @@ convert_value_from_python (PyObject *obj)
     }
   CATCH (except, RETURN_MASK_ALL)
     {
-      PyErr_Format (except.reason == RETURN_QUIT
-		    ? PyExc_KeyboardInterrupt : PyExc_RuntimeError,
-		    "%s", except.message);
+      gdbpy_convert_exception (except);
       return NULL;
     }
   END_CATCH