- if (!mp::xml::is_element_yp2(ptr, name))
- throw mp::XMLError("Expected element name " + name);
+ if (!mp::xml::is_element_mp(ptr, name))
+ {
+ std::string got_element = "<";
+ if (ptr && ptr->name)
+ got_element += std::string((const char *)ptr->name);
+ if (ptr && ptr->ns && ptr->ns->href){
+ got_element += " xmlns=\"";
+ got_element += std::string((const char *)ptr->ns->href);
+ got_element += "\"";
+ }
+ got_element += ">";
+
+ throw mp::XMLError("Expected XML element <" + name
+ + " xmlns=\"" + metaproxy_ns + "\">"
+ + ", not " + got_element);
+ }