[PAXCDI-78] Add check for null