BS-6759
Fix npe