diff --git a/g10/trustdb.c b/g10/trustdb.c
index 3f30ef3d4..6de9f6b66 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -72,7 +72,7 @@ static struct key_item *utk_list;      /* all ultimately trusted keys */
 static struct key_item *trusted_key_list;
 static int any_trusted_key_seen;
 
-/* Flag whether a trustdb chekc is pending.  */
+/* Flag whether a trustdb check is pending.  */
 static int pending_check_trustdb;
 
 
diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c
index c172fcc77..f02484c94 100644
--- a/tools/gpg-wks-client.c
+++ b/tools/gpg-wks-client.c
@@ -2026,7 +2026,7 @@ mirror_one_key (estream_t key)
         continue; /* No mail box or already processed.  */
       if (uid->expired)
         continue;
-      if (!domain_matches_mbox (domain, uid->mbox))
+      if (*domain && !domain_matches_mbox (domain, uid->mbox))
         continue; /* We don't want this one.  */
       if (is_in_blacklist (uid->mbox))
         continue;