diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/TreeUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/TreeUtils.java
index f7e276936b799c13b57abd0f565c72b1d15a2f01..4179774795a008f693b09435244bea55b9b5a424 100644
--- a/commons/common-util/src/main/java/com/schbrain/common/util/TreeUtils.java
+++ b/commons/common-util/src/main/java/com/schbrain/common/util/TreeUtils.java
@@ -76,14 +76,14 @@ public class TreeUtils {
 
     public static <T, E> List<E> buildNodeList(Collection<T> tree, Function<T, Collection<T>> childGetter, Function<T, E> mapper) {
         List<E> nodes = new ArrayList<>();
-        if (CollectionUtils.isEmpty(tree)) {
-            return nodes;
-        }
         doBuildNodeList(tree, childGetter, mapper, nodes);
         return nodes;
     }
 
     private static <E, T> void doBuildNodeList(Collection<T> tree, Function<T, Collection<T>> childGetter, Function<T, E> mapper, List<E> nodes) {
+        if (CollectionUtils.isEmpty(tree)) {
+            return;
+        }
         tree.forEach(node -> {
             nodes.add(mapper.apply(node));
             doBuildNodeList(childGetter.apply(node), childGetter, mapper, nodes);