changes required to remove annoying StructureException calls #54
changes required to remove annoying StructureException calls #54