From 79052a88bea63d14d023fefabaa60104755c31c4 Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Tue, 25 Sep 2018 13:56:04 +0200
Subject: [PATCH] Fix potential NPE

---
 .../java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index 5799036fa..67e0bbb1b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -477,6 +477,9 @@ public class CdmFormFactory extends FormToolkit {
      *            object.
      */
     public void destroySelectionArbitrator(SelectionArbitrator selectionArbitrator) {
+        if(selectionArbitrator==null){
+            return;
+        }
         removeSelectionListener(selectionArbitrator);
         if (selectionProvider != null) {
             selectionProvider.removeSelectionChangedListener(selectionArbitrator);
-- 
2.34.1