Fixed a couple of missed error cases.  Next step - make devices and parse the other sections