fix #7499 fix NPE for cancel of taxon node selection

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
index 0280b8aa7d52b8b60edb2284152293cf3f97fccb..182c1b52d6ab37ded46aa91d90747415958b56e3 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
@@ -186,7 +186,9 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
             init(taxonNode);
         }else if(taxonNodes.size() > 1){
             TaxonNode taxonNode = ChooseFromMultipleTaxonNodesDialog.choose(taxonNodes);
-            taxonNode = CdmStore.getService(ITaxonNodeService.class).load(taxonNode.getUuid(), getTaxonNodePropertyPaths());
+            if(taxonNode != null){
+                taxonNode = CdmStore.getService(ITaxonNodeService.class).load(taxonNode.getUuid(), getTaxonNodePropertyPaths());
+            }
             if(taxonNode != null){
                 init(taxonNode);
             }