diff --git a/vassal-app/src/main/java/VASSAL/configure/ConfigureTree.java b/vassal-app/src/main/java/VASSAL/configure/ConfigureTree.java index daa8fccd63..29e71a21e8 100644 --- a/vassal-app/src/main/java/VASSAL/configure/ConfigureTree.java +++ b/vassal-app/src/main/java/VASSAL/configure/ConfigureTree.java @@ -625,17 +625,21 @@ private List getSearchNodes(DefaultMutableTreeNode root) private void notifyUpdate(final Configurable target) { - if (target instanceof AbstractConfigurable) { - if (editorWindow.getListKeyCommands() != null) { - editorWindow.getListKeyCommands().updateConfigurable((AbstractConfigurable)target); + if (editorWindow != null) { + if (target instanceof AbstractConfigurable) { + if (editorWindow.getListKeyCommands() != null) { + editorWindow.getListKeyCommands().updateConfigurable((AbstractConfigurable)target); + } } } } private void notifyDelete(final Configurable target) { - if (target instanceof AbstractConfigurable) { - if (editorWindow.getListKeyCommands() != null) { - editorWindow.getListKeyCommands().deleteConfigurable((AbstractConfigurable)target); + if (editorWindow != null) { + if (target instanceof AbstractConfigurable) { + if (editorWindow.getListKeyCommands() != null) { + editorWindow.getListKeyCommands().deleteConfigurable((AbstractConfigurable)target); + } } } }