Fix assertion on client added second time, reuse old client in this case