BS-1877
fix npe