fixes #673, #2169, #2186

[taxeditor.git] / taxeditor-store / src / main / java / eu / etaxonomy / taxeditor / store / TermManager.java

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
index 4a4e542535023b5e388ac07d082ad1cbd7750cc2..f0b52dc890021cb1a23e3de55c2ff8610dcbeddf 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
@@ -72,6 +72,10 @@ public class TermManager extends ContextListenerAdapter{
        @Override
        public void contextStart(IMemento memento, IProgressMonitor monitor) {
                // read preferred terms from memento into an in memory representation
+               if(memento == null){
+                       return;
+               }
+               
                IMemento terms = memento.getChild(TERMS);
 
                if(terms == null){