A rather simple fix to avoid ClientExists and doing a separate GetClient...

Closes #155.