1 files changed, 4 insertions, 0 deletions
diff --git a/lib/query.cc b/lib/query.cc
index d241dc1d..59f4011b 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -249,6 +249,10 @@ notmuch_query_search_threads (notmuch_query_t *query)
 					      free, NULL);
 
     threads->messages = notmuch_query_search_messages (query);
+    if (threads->messages == NULL) {
+	    talloc_free (threads);
+	    return NULL;
+    }
 
     threads->thread_id = NULL;