BS-6931
Fix npe