BS-7276
Fix npe