[sprint 6] npe fix