BS-8480
Fix npe