diff --git a/src/org/openlcb/cdi/swing/CdiPanel.java b/src/org/openlcb/cdi/swing/CdiPanel.java
index 2c086625..39d7c50a 100644
--- a/src/org/openlcb/cdi/swing/CdiPanel.java
+++ b/src/org/openlcb/cdi/swing/CdiPanel.java
@@ -2406,8 +2406,12 @@ protected void writeDisplayTextToNode() {
         protected void updateDisplayText(@NonNull String value) {
             String retval = "";
             if (!value.isEmpty()) {
-                EventID eid = rep.eventNameStore.getEventID(value);
-                retval = rep.eventNameStore.getEventName(eid);
+                if (rep.eventNameStore != null ) {
+                    EventID eid = rep.eventNameStore.getEventID(value);
+                    retval = rep.eventNameStore.getEventName(eid);
+                } else {
+                    retval = value;
+                }
             }
             textField.setText(retval);
         }