diff --git a/libpkgconf/pkg.c b/libpkgconf/pkg.c
index bb4378d..ee8f1f9 100644
--- a/libpkgconf/pkg.c
+++ b/libpkgconf/pkg.c
@@ -1658,21 +1658,23 @@ pkgconf_pkg_traverse_main(pkgconf_client_t *client,
 			func(client, root, data);
 	}
 
-	if (!(client->flags & PKGCONF_PKG_PKGF_SKIP_CONFLICTS))
+	if (!(client->flags & PKGCONF_PKG_PKGF_SKIP_CONFLICTS) && root->conflicts.head != NULL)
 	{
+		PKGCONF_TRACE(client, "%s: walking 'Conflicts' list", root->id);
+
 		eflags = pkgconf_pkg_walk_conflicts_list(client, root, &root->conflicts);
 		if (eflags != PKGCONF_PKG_ERRF_OK)
 			return eflags;
 	}
 
-	PKGCONF_TRACE(client, "%s: walking requires list", root->id);
+	PKGCONF_TRACE(client, "%s: walking 'Requires' list", root->id);
 	eflags = pkgconf_pkg_walk_list(client, root, &root->required, func, data, maxdepth, skip_flags);
 	if (eflags != PKGCONF_PKG_ERRF_OK)
 		return eflags;
 
 	if (client->flags & PKGCONF_PKG_PKGF_SEARCH_PRIVATE)
 	{
-		PKGCONF_TRACE(client, "%s: walking requires.private list", root->id);
+		PKGCONF_TRACE(client, "%s: walking 'Requires.private' list", root->id);
 
 		/* XXX: ugly */
 		client->flags |= PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE;
diff --git a/libpkgconf/queue.c b/libpkgconf/queue.c
index 14c38a2..a9039ce 100644
--- a/libpkgconf/queue.c
+++ b/libpkgconf/queue.c
@@ -258,12 +258,12 @@ pkgconf_queue_verify(pkgconf_client_t *client, pkgconf_pkg_t *world, pkgconf_lis
 	 */
 	++client->serial;
 
-	PKGCONF_TRACE(client, "flattening requires deps");
+	PKGCONF_TRACE(client, "flattening 'Requires' deps");
 	flatten_dependency_set(client, &world->required);
 
 	++client->serial;
 
-	PKGCONF_TRACE(client, "flattening requires.private deps");
+	PKGCONF_TRACE(client, "flattening 'Requires.private' deps");
 	flatten_dependency_set(client, &world->requires_private);
 
 	return PKGCONF_PKG_ERRF_OK;