Index: Core/Common/src/Core.Common.Gui/Converters/KeyValueExpandableArrayConverter.cs =================================================================== diff -u -r569a286badd9b3494f5465cc2767a8cf6a77f618 -rc4b24c0a4946d7cd20c0fb302aa9c8e30f10afc6 --- Core/Common/src/Core.Common.Gui/Converters/KeyValueExpandableArrayConverter.cs (.../KeyValueExpandableArrayConverter.cs) (revision 569a286badd9b3494f5465cc2767a8cf6a77f618) +++ Core/Common/src/Core.Common.Gui/Converters/KeyValueExpandableArrayConverter.cs (.../KeyValueExpandableArrayConverter.cs) (revision c4b24c0a4946d7cd20c0fb302aa9c8e30f10afc6) @@ -47,7 +47,7 @@ public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes) { - var keyValueAttribute = context?.PropertyDescriptor?.Attributes?[typeof(KeyValueElementAttribute)] as KeyValueElementAttribute; + var keyValueAttribute = context?.PropertyDescriptor?.Attributes[typeof(KeyValueElementAttribute)] as KeyValueElementAttribute; if (keyValueAttribute == null) {