BS-11311
Fix npe