fix npe
BS-9874
Fix Organization migration