BS-1876
Fix npe