WIP fix exchange error handling and remove previous errors