diff --git a/ChangeLog b/ChangeLog
index 94e3ba5276..d0f3676c9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-03  Andy Wingo  <wingo@pobox.com>
 
+	* gst/gstmessage.override (_wrap_gst_message_parse_error): Always
+	return a tuple of length 2.
+
 	* examples/pipeline-tester: Commit some updates I had.
 
 	* configure.ac (PYGST_CFLAGS): pygst.py generation is handled by
diff --git a/gst/gstmessage.override b/gst/gstmessage.override
index f80c0ddfe8..0e17ec9064 100644
--- a/gst/gstmessage.override
+++ b/gst/gstmessage.override
@@ -97,8 +97,12 @@ _wrap_gst_message_parse_error (PyGstMiniObject *self)
 
 	ret = PyList_New(0);
 	PyList_Append(ret, pyg_boxed_new (GST_TYPE_G_ERROR, error, TRUE, TRUE));
-	if (debug != NULL)
+	if (debug != NULL) {
 		PyList_Append(ret, PyString_FromString(debug));
+	} else {
+		Py_INCREF (Py_None);
+		PyList_Append(ret, Py_None);
+	}
 
 	return ret;
 }