diff --git a/src/mu-cmd-cfind.c b/src/mu-cmd-cfind.c
index 1e03ad3e..17c38920 100644
--- a/src/mu-cmd-cfind.c
+++ b/src/mu-cmd-cfind.c
@@ -174,15 +174,18 @@ run_cmd_cfind (const char* pattern, OutputFormat format)
 	}
 
 	print_header (format);
-	rv = mu_contacts_foreach (contacts, (MuContactsForeachFunc)each_contact,
+	rv = mu_contacts_foreach (contacts,
+				  (MuContactsForeachFunc)each_contact,
 				  GINT_TO_POINTER(format), pattern, &num);
 	
 	mu_contacts_destroy (contacts);
 
-	if (rv) 
-		return (num == 0) ? MU_EXITCODE_NO_MATCHES : MU_EXITCODE_OK;
-	else
-		return MU_EXITCODE_ERROR;
+	if (num == 0) {
+		g_warning ("no matching contacts found");
+		return MU_EXITCODE_NO_MATCHES;
+	}
+
+	return rv ? MU_EXITCODE_OK : MU_EXITCODE_ERROR;
 
 	
 }
diff --git a/src/mu-cmd-find.c b/src/mu-cmd-find.c
index 068fa654..05e71ddf 100644
--- a/src/mu-cmd-find.c
+++ b/src/mu-cmd-find.c
@@ -180,8 +180,8 @@ run_query (MuQuery *xapian, const gchar *query, MuConfig *opts,
 
 	rv = run_query_format (iter, opts, format, count);
 		
-	if (rv && count && *count == 0) 
-		g_warning ("no matches found");
+	if (rv && count && *count == 0)
+		g_warning ("no matching messages found");
 	
 	mu_msg_iter_destroy (iter);