only use a new Client if timeout is not zero; fixes #1