improve error handling

JMRI · Mar 3, 2019 · 0077b39 · 0077b39
1 parent 0251b81
commit 0077b39
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/java/src/jmri/jmrix/swing/ConnectionsPreferencesPanel.java b/java/src/jmri/jmrix/swing/ConnectionsPreferencesPanel.java
@@ -82,7 +82,9 @@ public ConnectionsPreferencesPanel() {
                 removeTab(null, i);
             } else if (evt.getOldValue() == null) {
                 for (JmrixConfigPane pane : this.configPanes) {
-                    if (pane.getCurrentObject().equals(evt.getNewValue())) {
+                    if (pane.getCurrentObject() == null ) {
+                        log.error("did not expect pane.getCurrentObject()==null here for {} {} {}", i, evt.getNewValue(), configPanes);
+                    } else if (pane.getCurrentObject().equals(evt.getNewValue())) {
                         return; // don't add the connection again
                     }
                 }