diff --git a/src/services/collection.service.ts b/src/services/collection.service.ts
index 842f5614cb..39115e20bb 100644
--- a/src/services/collection.service.ts
+++ b/src/services/collection.service.ts
@@ -107,8 +107,8 @@ export class CollectionService implements CollectionServiceAbstraction {
             const collectionCopy = new CollectionView();
             collectionCopy.id = c.id;
             collectionCopy.organizationId = c.organizationId;
-            ServiceUtils.nestedTraverse(nodes, 0, c.name.replace(/^\/+|\/+$/g, '').split(NestingDelimiter),
-                collectionCopy, null, NestingDelimiter);
+            const parts = c.name != null ? c.name.replace(/^\/+|\/+$/g, '').split(NestingDelimiter) : [];
+            ServiceUtils.nestedTraverse(nodes, 0, parts, collectionCopy, null, NestingDelimiter);
         });
         return nodes;
     }
diff --git a/src/services/folder.service.ts b/src/services/folder.service.ts
index ba64f0e53a..754fa30b42 100644
--- a/src/services/folder.service.ts
+++ b/src/services/folder.service.ts
@@ -105,8 +105,8 @@ export class FolderService implements FolderServiceAbstraction {
             const folderCopy = new FolderView();
             folderCopy.id = f.id;
             folderCopy.revisionDate = f.revisionDate;
-            ServiceUtils.nestedTraverse(nodes, 0, f.name.replace(/^\/+|\/+$/g, '').split(NestingDelimiter),
-                folderCopy, null, NestingDelimiter);
+            const parts = f.name != null ? f.name.replace(/^\/+|\/+$/g, '').split(NestingDelimiter) : [];
+            ServiceUtils.nestedTraverse(nodes, 0, parts, folderCopy, null, NestingDelimiter);
         });
         return nodes;
     }