BS-10582
fix npe
BS-10582
fix npe