diff --git a/src/common/hexchat.c b/src/common/hexchat.c
index 71ea9791..fdae21d0 100644
--- a/src/common/hexchat.c
+++ b/src/common/hexchat.c
@@ -220,7 +220,7 @@ find_channel (server *serv, char *chan)
 	while (list)
 	{
 		sess = list->data;
-		if ((!serv || serv == sess->server) && sess->type == SESS_CHANNEL)
+		if ((serv == sess->server) && sess->type == SESS_CHANNEL)
 		{
 			if (!serv->p_cmp (chan, sess->channel))
 				return sess;
diff --git a/src/common/outbound.c b/src/common/outbound.c
index fe62bc2a..0df9c37c 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -1311,7 +1311,7 @@ cmd_menu (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 	if (markup)
 	{
 		char *p;	/* to force pango closing tags through */
-		for (p = label; *p; p++)
+		for (p = label; p && *p; p++)
 			if (*p == 3)
 				*p = '/';
 	}