Fix potential NPE #5511

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / selection / EditFromSelectionWizard.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
index d40ecf09a122b81fe574ce74b5b7e64be9e4ee7f..08efabd7e04984d573c125d7fd6a3c27dbe96c55 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
@@ -167,7 +167,9 @@ public class EditFromSelectionWizard extends Wizard implements
        public boolean performFinish() {
            IService<CdmBase> service = CdmStore.getService(rootElement);
            service.merge(rootElement, true);
-           previousCdmEntitySession.load(rootElement, true);
+           if(previousCdmEntitySession!=null){
+               previousCdmEntitySession.load(rootElement, true);
+           }
                return true;
        }