Fix crashes during Move/Delete folder