diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index dd722fea..4966d77d 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -37,10 +37,8 @@ static int compare_channel_setup (CONFIG_NODE *node, CHANNEL_SETUP_REC *channel)
 	name = config_node_get_str(node, "name", NULL);
 	chatnet = config_node_get_str(node, "chatnet", NULL);
 
-	if (name == NULL || chatnet == NULL)
-		return 1;
-
-	if (strcmp(name, channel->name) || strcmp(chatnet, channel->chatnet))
+	if (g_strcmp0(name, channel->name) != 0 || 
+	    g_strcmp0(chatnet, channel->chatnet) != 0)
 		return 1;
 
 	return 0;
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 26632d63..4a048282 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -432,11 +432,9 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
 	chatnet = config_node_get_str(node, "chatnet", NULL);
 	port = config_node_get_int(node, "port", 0);
 
-	if (address == NULL || chatnet == NULL)
-		return 1;
-
-	if (strcmp(address, server->address) || strcmp(chatnet, server->chatnet)
-	    || port != server->port)
+	if (g_strcmp0(address, server->address) != 0 ||
+	    g_strcmp0(chatnet, server->chatnet) != 0 ||
+	    port != server->port)
 		return 1;
 
 	return 0;