fix 'could destabilise runtime' error if structs threw an error; also tidied up the locals and made the func return the right type