From b6179473ee1ff91a8badaf7275c868122dfba040 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Mon, 11 Jun 2012 08:53:04 +0000
Subject: [PATCH] fixing NPE in Dwc-A import

---
 .../in/DwcTaxonCsv2CdmTaxonConverter.java     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonCsv2CdmTaxonConverter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonCsv2CdmTaxonConverter.java
index 051781f315..95c1f5fac9 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonCsv2CdmTaxonConverter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonCsv2CdmTaxonConverter.java
@@ -277,15 +277,18 @@ public class DwcTaxonCsv2CdmTaxonConverter extends PartitionableConverterBase<Dw
 		}
 		// by Kingdom
 		String strKingdom = getValue(item, TermUri.DWC_KINGDOM);
-		if (strKingdom.equalsIgnoreCase("Plantae")){
-			nomCode = NomenclaturalCode.ICBN;
-		}else if (strKingdom.equalsIgnoreCase("Fungi")){
-			nomCode = NomenclaturalCode.ICBN;
-		}else if (strKingdom.equalsIgnoreCase("Animalia")){
-			nomCode = NomenclaturalCode.ICZN;
-		}else if (strKingdom.equalsIgnoreCase("Protozoa")){
-			nomCode = NomenclaturalCode.ICZN;
+		if (strKingdom != null){
+			if (strKingdom.equalsIgnoreCase("Plantae")){
+				nomCode = NomenclaturalCode.ICBN;
+			}else if (strKingdom.equalsIgnoreCase("Fungi")){
+				nomCode = NomenclaturalCode.ICBN;
+			}else if (strKingdom.equalsIgnoreCase("Animalia")){
+				nomCode = NomenclaturalCode.ICZN;
+			}else if (strKingdom.equalsIgnoreCase("Protozoa")){
+				nomCode = NomenclaturalCode.ICZN;
+			}
 		}
+		
 		//TODO further kingdoms
 		if (nomCode == null){
 			//TODO warning
-- 
2.34.1