A rather simple fix to avoid ClientExists and doing a separate GetClient call.
Merging #166.