[CnP] Fix prevent of null dereference