Added two root nodes and more robust error messages.  Still need to
update junits accordingly.