From b310b0b027dd0cb94f8867cf531e07bb78c340af Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Tue, 1 Dec 2015 15:38:32 +0100
Subject: [PATCH] Fix possible NPE

---
 .../editor/view/derivate/DerivateView.java         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index 630eef093..0d587c2c2 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@ -491,13 +491,15 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
                     }
                 }
             }
-            Collection<SpecimenOrObservationBase> fieldUnits = CdmStore.getService(IOccurrenceService.class).listFieldUnitsByAssociatedTaxon(selectedTaxon, null, null);
-            Collection<UUID> uuids = new HashSet<UUID>();
-            for (SpecimenOrObservationBase specimenOrObservationBase : fieldUnits) {
-                uuids.add(specimenOrObservationBase.getUuid());
+            if(selectedTaxon!=null){
+                Collection<SpecimenOrObservationBase> fieldUnits = CdmStore.getService(IOccurrenceService.class).listFieldUnitsByAssociatedTaxon(selectedTaxon, null, null);
+                Collection<UUID> uuids = new HashSet<UUID>();
+                for (SpecimenOrObservationBase specimenOrObservationBase : fieldUnits) {
+                    uuids.add(specimenOrObservationBase.getUuid());
+                }
+                updateRootEntities(uuids);
+                setPartName("Derivative Editor: " + selectedTaxon.getName());
             }
-            updateRootEntities(uuids);
-            setPartName("Derivative Editor: " + selectedTaxon.getName());
         }
     }
 
-- 
2.34.1