X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Ftags.c;h=85507e91fc35da13b52b1b82b2bcbe2a71af8f83;hp=afc132c50e17c2f41cb6f6709e3c6d827d237b95;hb=c979fc5b05a541d8488b77cbbc590ed3955690df;hpb=322fe4f3fb6a547764715aecb4992f1c77547579

diff --git a/lib/tags.c b/lib/tags.c
index afc132c5..85507e91 100644
--- a/lib/tags.c
+++ b/lib/tags.c
@@ -97,15 +97,18 @@ notmuch_tags_has_more (notmuch_tags_t *tags)
 const char *
 notmuch_tags_get (notmuch_tags_t *tags)
 {
-    if (tags->iterator)
-	return (char *) tags->iterator->data;
-    else
+    if (tags->iterator == NULL)
 	return NULL;
+
+    return (char *) tags->iterator->data;
 }
 
 void
 notmuch_tags_advance (notmuch_tags_t *tags)
 {
+    if (tags->iterator == NULL)
+	return;
+
     tags->iterator = tags->iterator->next;
 }