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

diff --git a/message.cc b/message.cc
index ce600af9..ee0e8e1f 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;
@@ -521,7 +522,7 @@ notmuch_tags_has_more (notmuch_tags_t *tags)
 	return FALSE;
 
     s = *tags->iterator;
-    if (s.size () && s[0] == 'L')
+    if (! s.empty () && s[0] == 'L')
 	return TRUE;
     else
 	return FALSE;