Merge "XmlBlock: Avoid potential NULL dereference"