Merge "check for null content in ApiParse.php"