Use exceptions to report calls to Node with _node == 0.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/cxml.cc b/src/cxml.cc
index 3c2eda2..d3ec9e7 100644
--- a/src/cxml.cc
+++ b/src/cxml.cc
@@ -43,7 +43,9 @@ cxml::Node::Node (xmlpp::Node* node)
 string
 cxml::Node::name () const
 {
-	assert (_node);
+	if (!_node) {
+		throw Error ("No node to read name from");
+	}
 	return _node->get_name ();
 }
 
@@ -76,6 +78,9 @@ cxml::Node::optional_node_child (string name) const
 list<shared_ptr<cxml::Node> >
 cxml::Node::node_children () const
 {
+	if (!_node) {
+		throw Error ("No node to read children from");
+	}
 	xmlpp::Node::NodeList c = _node->get_children ();
 
 	list<shared_ptr<cxml::Node> > n;