diff --git a/Source/Editor/CustomEditors/Editors/CollectionEditor.cs b/Source/Editor/CustomEditors/Editors/CollectionEditor.cs index 1ed2f7cb1..6a2ad138b 100644 --- a/Source/Editor/CustomEditors/Editors/CollectionEditor.cs +++ b/Source/Editor/CustomEditors/Editors/CollectionEditor.cs @@ -1016,11 +1016,11 @@ namespace FlaxEditor.CustomEditors.Editors var result = base.OnDragDrop(ref location, data); if (result != DragDropEffect.None) { - _dragHandlers.OnDragDrop(null); + _dragHandlers?.OnDragDrop(null); return result; } - if (_dragHandlers.HasValidDrag) + if (_dragHandlers != null && _dragHandlers.HasValidDrag) { if (_dragItems.HasValidDrag) {