Fix potential NPE

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
index 082a22b2b22735d5bc5e3625c937165cb58788c4..3430ce0b5600dcf92b6d5d48e68be718cbbf2298 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
@@ -58,7 +58,11 @@ public class TaxonNodeLabelProvider extends ColumnLabelProvider
                        try{
                                Taxon taxon = HibernateProxyHelper.deproxy(taxonNode.getTaxon());
                                if(taxon == null){
-                                       return taxonNode.getClassification().getName().getText();
+                                   String text = taxonNode.getClassification().getName().getText();
+                                       if(text==null){
+                                           text = taxonNode.getClassification().getTitleCache();
+                                       }
+                    return text;
                                        //MessagingUtils.error(getClass(), String.format(Messages.TaxonNodeLabelProvider_NODE_WITH_NO_TAXON, element), null);
 //                                     throw new RuntimeException("The data your are trying to view is corrupt. Please check your import.");
                                }else{
@@ -95,7 +99,6 @@ public class TaxonNodeLabelProvider extends ColumnLabelProvider
                        styler = getNotGrantedStyler();
                }
                return new StyledString(getText(element), styler);
-
        }
 
        /**