BS-7999
Fix npe