fix crash.
Merge branch 'hotfix/fix_crash_on_delete' into develop