Fix possible NPE

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtilE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtilE4.java
index 7fdbe866a20f99e79f478d21b7b7ed52121a325f..18eff4ce2fb37d91580f0f4863875821a52c4323 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtilE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtilE4.java
@@ -65,7 +65,10 @@ public class CdmViewerUtilE4 {
                         String commandId = configElement.getAttribute("commandId"); //$NON-NLS-1$
                         String viewerName = configElement.getAttribute("viewerName"); //$NON-NLS-1$
                         Class<?> selectionClass = Class.forName(configElement.getAttribute("selection")); //$NON-NLS-1$
-                        if(selectionClass.isAssignableFrom(input.getClass())){
+                        if(selectionClass!=null
+                                && commandId!=null
+                                && viewerName!=null
+                                && selectionClass.isAssignableFrom(input.getClass())){
                             Command command = commandService.getCommand(commandId);
                             commandViewerNameMap.put(command, viewerName);
                         }