Fixed NullReferenceException on drop
Merge branch 'hotfix/NullRefExOnDrop' into develop