From 3ccc1677077713c5b7d994656270dded3fed2ff4 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 17 Jun 2026 10:30:07 +0200
Subject: [PATCH] Fix error on drag&drop in Editor

---
 Source/Editor/CustomEditors/Editors/CollectionEditor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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)
                     {