Improve the clarity of the no-xml-element-found message

And also the code that uses it.

Change-Id: Ibc6ed951a9883bb85b8fc10be3e46500b34939e7
Merge "Improve the clarity of the no-xml-element-found message"