diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c
index f16cf16c..fc0c49f6 100644
--- a/src/irc/notifylist/notifylist.c
+++ b/src/irc/notifylist/notifylist.c
@@ -184,6 +184,9 @@ static void notifylist_init_server(IRC_SERVER_REC *server)
 
 	g_return_if_fail(server != NULL);
 
+	if (!IS_IRC_SERVER(server))
+		return;
+
 	rec = g_new0(MODULE_SERVER_REC,1 );
 	MODULE_DATA_SET(server, rec);
 
@@ -197,6 +200,9 @@ static void notifylist_deinit_server(IRC_SERVER_REC *server)
 
 	g_return_if_fail(server != NULL);
 
+	if (!IS_IRC_SERVER(server))
+		return;
+
 	mserver = MODULE_DATA(server);
 	while (mserver->notify_users != NULL) {
 		rec = mserver->notify_users->data;