ref #6925 fix potential NPE

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/LifeCycleManager.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/LifeCycleManager.java
index 663589e3cd8993f4a825b8db433b7b67c4f98905..8c477db4955762c814fad6984e597f6461bca150 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/LifeCycleManager.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/LifeCycleManager.java
@@ -72,10 +72,13 @@ public class LifeCycleManager implements IContextListener{
         List<MPart> elements = modelService.findElements(application, null, MPart.class, Arrays.asList(NON_RESTORE));
         for (MPart part : elements) {
             MElementContainer<MUIElement> parent = part.getParent();
-            if(parent.getSelectedElement().equals(part)){
-                parent.setSelectedElement(null);
+            if(parent!=null){
+                if(parent.getSelectedElement()!=null
+                        && parent.getSelectedElement().equals(part)){
+                    parent.setSelectedElement(null);
+                }
+                parent.getChildren().remove(part);
             }
-            parent.getChildren().remove(part);
         }
 
         //FIXME E4 org.eclipse.ui.ediorss will not exist anymore when fully migrated