X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=bindings%2Fpython%2Fnotmuch%2Ftag.py;fp=bindings%2Fpython%2Fnotmuch%2Ftag.py;h=f79a17867640700529d930c9f0d59cd61c7a68fb;hp=0ce6f9ae46c7ade1ae36f6fc2a1a7ba571b339e6;hb=94c5edd064f856a888ce29f7ac1523006b4b8fd6;hpb=e75fd0d937fc93074f6aaee1bcbaa28ddcb70059

diff --git a/bindings/python/notmuch/tag.py b/bindings/python/notmuch/tag.py
index 0ce6f9ae..f79a1786 100644
--- a/bindings/python/notmuch/tag.py
+++ b/bindings/python/notmuch/tag.py
@@ -83,12 +83,10 @@ class Tags(object):
     def next(self):
         if self._tags is None:
             raise NotmuchError(STATUS.NOT_INITIALIZED)
-        # No need to call nmlib.notmuch_tags_valid(self._tags);
-        # Tags._get safely returns None, if there is no more valid tag.
-        tag = Tags._get(self._tags).decode('utf-8')
-        if tag is None:
+        if not nmlib.notmuch_tags_valid(self._tags):
             self._tags = None
             raise StopIteration
+        tag = Tags._get(self._tags).decode('utf-8')
         nmlib.notmuch_tags_move_to_next(self._tags)
         return tag