Handle null object in StoreUtil.getCdmEntity

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 07e4062608e15502ae42dc144d2d3f49b5dcf6fc..69e94c1ecacb6cde2818964db44d46c101e0441e 100644 (file)
--- 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????
         */
        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){
             return ((DerivedUnitFacade)object).baseUnit();
         }
         else if(object instanceof FeatureNodeContainer){