Hi Sebastien, > If mms_store_file fails. > --- > src/service.c | 9 +++++++++ > 1 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/src/service.c b/src/service.c > index 3fdf4e0..0161ec0 100644 > --- a/src/service.c > +++ b/src/service.c > @@ -767,6 +767,15 @@ static DBusMessage *send_message(DBusConnection *conn, > > msg->uuid = g_strdup(mms_store_file(service->identity, > request->data_path)); > + if (msg->uuid == NULL) { > + release_attachement_data(msg->attachments); > + mms_message_free(msg); > + > + unlink(request->data_path); > + mms_request_destroy(request); > + > + return __mms_error_trans_failure(dbus_msg); > + } I am seeing a lot of code duplication here. We need to unify this. Regards Marcel