diff --git a/lib/mu-msg-iter.cc b/lib/mu-msg-iter.cc
index c6c5061d..969d0e67 100644
--- a/lib/mu-msg-iter.cc
+++ b/lib/mu-msg-iter.cc
@@ -405,7 +405,10 @@ const MuMsgIterThreadInfo*
 mu_msg_iter_get_thread_info (MuMsgIter *iter)
 {
 	g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
-	g_return_val_if_fail (iter->thread_hash(), NULL);
+
+	/* maybe we don't have thread info */
+	if (!iter->thread_hash())
+		return NULL;
 
 	try {
 		const MuMsgIterThreadInfo *ti;
diff --git a/lib/mu-msg-iter.h b/lib/mu-msg-iter.h
index 68abab6a..d4169c73 100644
--- a/lib/mu-msg-iter.h
+++ b/lib/mu-msg-iter.h
@@ -179,6 +179,7 @@ typedef struct _MuMsgIterThreadInfo MuMsgIterThreadInfo;
 /**
  * get a the MuMsgThreaderInfo struct for this message; this only
  * works when you created the mu-msg-iter with threading enabled
+ * (otherwise, return NULL)
  *
  * @param iter a valid MuMsgIter iterator
  *
diff --git a/mu/mu-cmd.c b/mu/mu-cmd.c
index 1b8c6bc4..20bd9731 100644
--- a/mu/mu-cmd.c
+++ b/mu/mu-cmd.c
@@ -529,7 +529,7 @@ show_usage (void)
 {
 	g_print ("usage: mu command [options] [parameters]\n");
 	g_print ("where command is one of index, find, cfind, view, mkdir, "
-		   "extract, add, remove, stats, verify or server\n");
+		   "extract, add, remove, script, verify or server\n");
 	g_print ("see the mu, mu-<command> or mu-easy manpages for "
 		   "more information\n");
 }