From 30eec98647380b4f756df25697209a42088d5fff Mon Sep 17 00:00:00 2001
From: "p.plitzner" <p.plitzner@bgbm.org>
Date: Mon, 22 Feb 2016 18:16:46 +0100
Subject: [PATCH] Fix potential NPE #5511

---
 .../taxeditor/ui/selection/EditFromSelectionWizard.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 d40ecf09a..08efabd7e 100644
--- 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;
 	}
 
-- 
2.34.1