X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=message.cc;h=65e5ad78a269b6da86ef5a3b7c289871d8096712;hp=ce600af94b1340310aa252cf7a8ee0433aae1929;hb=ce5d78296251b529838df0dbd4dc3b9a90030924;hpb=6ccdffcd87b8af0c1c683588612169f5dc776644

diff --git a/message.cc b/message.cc
index ce600af9..65e5ad78 100644
--- a/message.cc
+++ b/message.cc
@@ -215,10 +215,11 @@ notmuch_message_get_message_id (notmuch_message_t *message)
     i = message->doc.termlist_begin ();
     i.skip_to (_find_prefix ("msgid"));
 
-    /* XXX: This should really be an internal error, but we'll need to
-     * fix the add_message side of things first. */
-    if (i == message->doc.termlist_end ())
-	return NULL;
+    if (i == message->doc.termlist_end ()) {
+	fprintf (stderr, "Internal error: Message with document ID of %d has no message ID.\n",
+		 message->doc_id);
+	exit (1);
+    }
 
     message->message_id = talloc_strdup (message, (*i).c_str () + 1);
     return message->message_id;