Retaining more location info in the face of XML deserialiser errors