Ensure errors are handled where needed