From 4a5c535799858af519f638d2c4ecc49967dd8487 Mon Sep 17 00:00:00 2001
From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Tue, 26 May 2015 08:59:50 +0000
Subject: [PATCH]  - fixed NPE (#4883)

---
 .../java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
index 658b72c31..dd393a39d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
@@ -422,7 +422,7 @@ public class DescriptionHelper {
 		}
 		else if(element instanceof CategoricalData){
 			String categoricalDataText = getCategoricalDataText((CategoricalData) element);
-			if(categoricalDataText.isEmpty()){
+			if(categoricalDataText==null || categoricalDataText.isEmpty()){
 			    categoricalDataText = noLabelString;
 			}
             return categoricalDataText;
@@ -438,7 +438,7 @@ public class DescriptionHelper {
 		}
 		else if (element instanceof QuantitativeData) {
 			String quantitativeDataText = getQuantitativeDataText((QuantitativeData) element);
-			if(quantitativeDataText.isEmpty()){
+			if(quantitativeDataText==null || quantitativeDataText.isEmpty()){
                 quantitativeDataText = noLabelString;
 			}
             return quantitativeDataText;
-- 
2.34.1