[DF-3790] Added null-pointer validation