diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/SymbolWidget.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/SymbolWidget.java index ee5b473f16..259673d87f 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/SymbolWidget.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/SymbolWidget.java @@ -99,13 +99,8 @@ public Widget createWidget ( ) { Messages.WidgetProperties_Symbols, (widget, index) -> { String symbol = DEFAULT_SYMBOL; - try { - if (index > 0) - symbol = ((SymbolWidget)widget).propSymbols().getElement(index - 1).getValue(); - } catch (IndexOutOfBoundsException e) { - // It is expected when a widget with more than 2 symbols is parsed - // and the property is being populated --> safe to ignore - } + if (index > 0 && index <= ((SymbolWidget)widget).propSymbols().size()) + symbol = ((SymbolWidget)widget).propSymbols().getElement(index - 1).getValue(); return propSymbol(index).createProperty(widget, symbol); }, 0