#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 f9401eeee53caef77e05d91de846df7f47641399..8f444705eb0f195a1c0f5fed1a1cd44b2eb628c6 100644 (file)
--- 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));
                }