diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c
index 0e85b44c..9f0ae095 100644
--- a/src/irc/core/netsplit.c
+++ b/src/irc/core/netsplit.c
@@ -309,6 +309,9 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 {
 	NETSPLIT_REC *rec;
 
+	if (nick == NULL)
+		return;
+
 	/* check if split is over */
 	rec = g_hash_table_lookup(server->splits, nick);
 
@@ -331,6 +334,9 @@ static void event_join_last(IRC_SERVER_REC *server, const char *data,
 {
 	NETSPLIT_REC *rec;
 
+	if (nick == NULL)
+		return;
+
 	rec = g_hash_table_lookup(server->splits, nick);
 	if (rec != NULL) {
 		g_hash_table_remove(server->splits, rec->nick);
diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c
index 0e8155fd..e91ba199 100644
--- a/src/irc/notifylist/notifylist.c
+++ b/src/irc/notifylist/notifylist.c
@@ -273,6 +273,9 @@ static void notifylist_check_join(IRC_SERVER_REC *server, const char *nick,
 	NOTIFY_NICK_REC *rec;
 	char *user, *host;
 
+	if (nick == NULL)
+		return;
+
 	notify = notifylist_find(nick, server->connrec->chatnet);
 	if (notify == NULL) return;