From dfcde26ec5ce1e7ef8a80b1e9840a7b2f5b64902 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Wed, 20 Aug 2014 15:03:08 +0000
Subject: [PATCH 1/1] Handle null object in StoreUtil.getCdmEntity

---
 .../src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
index 07e406260..69e94c1ec 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
@@ -55,7 +55,9 @@ public class StoreUtil extends AbstractUtility {
 	 */
 	public static CdmBase getCdmEntity(Object object){
         // TODO temporary solution for ticket #4091????
-        if(object instanceof DerivedUnitFacade){
+        if (object == null){
+        	return null;   //not sure if an object should ever be null at this point, but this needs to be handled in calling methods
+        }else if(object instanceof DerivedUnitFacade){
             return ((DerivedUnitFacade)object).baseUnit();
         }
         else if(object instanceof FeatureNodeContainer){
-- 
2.34.1