Merge "cnss2: add null pointer check"