Stop shotgun-parsing XML files, and propagate unexpeced errors. #22