#20 Fix notices in StructureHandler