diff --git a/kike.c b/kike.c
index 64bebc9..d0aa6a3 100644
--- a/kike.c
+++ b/kike.c
@@ -2459,12 +2459,12 @@ irc_handle_whois (const struct irc_message *msg, struct client *c)
 		{
 			struct str_map_iter iter = str_map_iter_make (&c->ctx->users);
 			bool found = false;
-			while ((target = str_map_iter_next (&iter))
-				&& !irc_fnmatch (mask, target->nickname))
-			{
-				irc_send_whois_reply (c, target);
-				found = true;
-			}
+			while ((target = str_map_iter_next (&iter)))
+				if (!irc_fnmatch (mask, target->nickname))
+				{
+					irc_send_whois_reply (c, target);
+					found = true;
+				}
 			if (!found)
 				irc_send_reply (c, IRC_ERR_NOSUCHNICK, mask);
 		}