X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=database.cc;h=0fd0bdadf8103366b4c2f95924926d1f532df0ca;hp=8d477eca069abb7e3d1619d5881d3b3ad8d44469;hb=203a717d64864411eb6802c06a5a0ad1cf98e077;hpb=854f82fb91ef9560259e4597d475747e948204d5

diff --git a/database.cc b/database.cc
index 8d477eca..0fd0bdad 100644
--- a/database.cc
+++ b/database.cc
@@ -836,6 +836,9 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
     const char *from, *to, *subject, *old_filename;
     char *message_id;
 
+    if (message_ret)
+	*message_ret = NULL;
+
     message_file = notmuch_message_file_open (filename);
     if (message_file == NULL) {
 	ret = NOTMUCH_STATUS_FILE_ERROR;
@@ -932,7 +935,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
   DONE:
     if (message) {
-	if (message_ret)
+	if (ret == NOTMUCH_STATUS_SUCCESS && message_ret)
 	    *message_ret = message;
 	else
 	    notmuch_message_destroy (message);