diff --git a/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs b/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs index 52121e0a76..aa4fe55f79 100644 --- a/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs +++ b/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs @@ -73,7 +73,10 @@ namespace Avalonia.Data.Core } } - Debug.Assert(accessor != null); + if (accessor is null) + { + throw new AvaloniaInternalException("Data validators must return non-null accessor."); + } _accessor = accessor; accessor.Subscribe(ValueChanged);