X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/240579c398767a45147d522b72329ffd6037370b..234ca92e5c3907794c58a8a4c2bcf34ad66ec39a:/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java
index d053656779..aebd385b09 100644
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java
@@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
@@ -175,18 +174,20 @@ public class EditGeoService implements IEditGeoService{
 			List<Point> derivedUnitPoints) {
 
 		Set<SpecimenOrObservationBase> originals = derivedUnit.getOriginals();
-		for (SpecimenOrObservationBase original : originals) {
-			if (original instanceof FieldObservation) {
-				Point point =  ((FieldObservation) original).getGatheringEvent().getExactLocation();
-				if(point != null){
-					//FIXME: remove next statement after DerivedUnitFacade or ABCD import is fixed
-					if(point.getLatitude() == 0.0 && point.getLongitude() == 0.0){
-						continue;
+		if(originals != null){
+			for (SpecimenOrObservationBase original : originals) {
+				if (original instanceof FieldObservation) {
+					Point point =  ((FieldObservation) original).getGatheringEvent().getExactLocation();
+					if(point != null){
+						//FIXME: remove next statement after DerivedUnitFacade or ABCD import is fixed
+						if(point.getLatitude() == 0.0 && point.getLongitude() == 0.0){
+							continue;
+						}
+						derivedUnitPoints.add(point);
 					}
-					derivedUnitPoints.add(point);
+				} else {
+					registerDerivedUnitLocations((DerivedUnitBase) original, derivedUnitPoints);
 				}
-			} else {
-				registerDerivedUnitLocations((DerivedUnitBase) original, derivedUnitPoints);
 			}
 		}