Index: bindings/python/rhythmdb.override
===================================================================
--- bindings/python/rhythmdb.override	(revision 4827)
+++ bindings/python/rhythmdb.override	(working copy)
@@ -633,7 +633,8 @@ _wrap_rhythmdb_emit_entry_extra_metadata
 		return NULL;
 	}
 
-	type = pyg_type_from_object((PyObject *) py_metadata->ob_type);
+	type = (py_metadata == Py_None) ? G_TYPE_POINTER
+		: pyg_type_from_object((PyObject *) py_metadata->ob_type);
 	if (! type) {
 		PyErr_SetString(PyExc_TypeError, "can't map metadata to GType system");
 		return NULL;
