Add NULL checks where ContentInfo data can be NULL

Add NULL checks where ContentInfo data can be NULL #83