X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/98cfec8fdc0f6edc794366757d8753a3ad8bfe15..45546a913cf144912d383d54758aa51c81367ec9:/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java
index 6a6e1fea34..6a7a1ce77a 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java
@@ -15,6 +15,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import javax.persistence.EntityNotFoundException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -106,7 +108,10 @@ public class FeatureTreeServiceImpl extends IdentifiableServiceBase<FeatureTree,
         }
 
         FeatureTree featureTree = load(uuid, rootPaths);
-        dao.loadNodes(featureTree.getRoot(),nodePaths);
+        if(featureTree == null){
+            throw new EntityNotFoundException("No FeatureTree entity found for " + uuid);
+        }
+        dao.deepLoadNodes(featureTree.getRoot().getChildNodes() ,nodePaths);
         return featureTree;
     }