From: Katja Luther <k.luther@bgbm.org>
Date: Thu, 29 Jan 2015 12:22:13 +0000 (+0000)
Subject: #4625
X-Git-Tag: 3.6.0~228
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/a92bde9b2acb82f694089c0e326be8dfa16cd5ca

#4625
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
index f9401eeee..8f444705e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
@@ -103,7 +103,7 @@ public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName
 	/** {@inheritDoc} */
 	public void setTaxonBase(TaxonBase entity) {
 		this.taxonBase = entity;
-		NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(entity.getName());
+		NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(entity.getName(), NonViralName.class);
 		setEntity(name);
 	}
 	
@@ -126,6 +126,9 @@ public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName
 	 */
 	private List<TaxonNameDescription> getTaxonNameDescriptions(TaxonNameBase<?,?> name){
 		List<TaxonNameDescription> result = new ArrayList<TaxonNameDescription>();
+		if (name == null){
+			return result;
+		}
 		if(name.getDescriptions().size() == 0){
 			name.addDescription(TaxonNameDescription.NewInstance(name));
 		}