diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java
index db35117fbe9df67f2b526b3a7d4d1f203aeb8ef4..8c4d4a61b49026df2a71a72a1903b8781affa90d 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java
@@ -243,16 +243,15 @@ public class PathInfoProviderBasedHierarchicalContent implements IHierarchicalCo
         @Override
         protected List<IHierarchicalContentNode> doGetChildNodes()
         {
+            List<IHierarchicalContentNode> result = new ArrayList<IHierarchicalContentNode>();
             List<DataSetPathInfo> pathInfos =
                     dataSetPathInfoProvider.listChildrenPathInfos(pathInfo);
-            if (pathInfos == null)
-            {
-                throw new IllegalArgumentException("No children path infos for " + pathInfo.getRelativePath());
-            }
-            List<IHierarchicalContentNode> result = new ArrayList<IHierarchicalContentNode>();
-            for (DataSetPathInfo child : pathInfos)
+            if (pathInfos != null)
             {
-                result.add(asNode(child));
+                for (DataSetPathInfo child : pathInfos)
+                {
+                    result.add(asNode(child));
+                }
             }
             return result;
         }