From d8de6c7141ebd20734ef7352c02e3e27e15d8abd Mon Sep 17 00:00:00 2001
From: Cherian Mathew <c.mathew@bgbm.org>
Date: Tue, 15 Sep 2015 18:52:20 +0200
Subject: [PATCH] Add null check for session

---
 .../taxeditor/view/derivateSearch/DerivateSearchView.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
index 6eb54ff1c..8a14a5a73 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
@@ -96,7 +96,7 @@ public class DerivateSearchView extends ViewPart implements IContextListener, IC
     }
 
     private void initSession() {
-        if(CdmStore.isActive() && cdmEntitySession == null) {
+        if(CdmStore.isActive()) {
             cdmEntitySession = CdmStore.getCurrentSessionManager().newSession(this, true);
         }
     }
@@ -126,7 +126,9 @@ public class DerivateSearchView extends ViewPart implements IContextListener, IC
             conversationHolder.close();
         }
 
-        cdmEntitySession.dispose();
+        if(cdmEntitySession != null) {
+            cdmEntitySession.dispose();
+        }
         super.dispose();
     }
 
-- 
2.34.1