Make ContentVersion Id node optional. Improve error message slightly.

2 files changed, 2 insertions, 2 deletions

diff --git a/src/cpl.cc b/src/cpl.cc
index 649d54b7..80962f4f 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -50,7 +50,7 @@ CPL::CPL (string file)
 ContentVersion::ContentVersion (xmlpp::Node const * node)
 	: XMLNode (node)
 {
-	id = string_node ("Id");
+	id = optional_string_node ("Id");
 	label_text = string_node ("LabelText");
 	done ();
 }
diff --git a/src/xml.cc b/src/xml.cc
index 35c4fe12..7a2bee2e 100644
--- a/src/xml.cc
+++ b/src/xml.cc
@@ -31,7 +31,7 @@ XMLNode::xml_node (string name)
 	if (n.size() > 1) {
 		throw XMLError ("duplicate XML tag " + name);
 	} else if (n.empty ()) {
-		throw XMLError ("missing XML tag " + name);
+		throw XMLError ("missing XML tag " + name + " in " + _node->get_name());
 	}
 	
 	return n.front ();