handle terms without vocabulary

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
index a154fcf7978b60a4de7b4e584bff89cea34cd791..922835a6657bdde309aa307c7d083dd1cb961dcd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
@@ -171,8 +171,10 @@ public class TermManager {
                }
                if (filteredTerms.isEmpty()){
                    //check for dtos
-
-                   List<TermDto> preferredTerms = cachedTermMap.get(initialTerms.get(0).getVocabulary().getUuid());
+                   List<TermDto> preferredTerms = null;
+                   if (initialTerms.get(0).getVocabulary() != null){
+                       preferredTerms = cachedTermMap.get(initialTerms.get(0).getVocabulary().getUuid());
+                   }
                    if (preferredTerms == null){
                        preferredTerms = cachedTermMap.get(initialTerms.get(0).getTermType());
                    }