diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 2e210382..cc630a58 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -475,6 +475,7 @@ static void event_away_notify(IRC_SERVER_REC *server, const char *data, const ch
 	if (!IS_IRC_SERVER(server))
 		return;
 
+	g_return_if_fail(nick != NULL);
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 1 | PARAM_FLAG_GETREST, &awaymsg);
diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index 52b0e86a..be406d3d 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -111,6 +111,7 @@ static void event_chghost(IRC_SERVER_REC *server, const char *data,
 	char *params, *user, *host, *address;
 	GSList *nicks, *tmp;
 
+	g_return_if_fail(nick != NULL);
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 2, &user, &host);
@@ -135,6 +136,7 @@ static void event_account(IRC_SERVER_REC *server, const char *data,
 	char *params, *account;
 	GSList *nicks, *tmp;
 
+	g_return_if_fail(nick != NULL);
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 1, &account);