Cleaning up error catching for organizatons