Ensure consistent getClient signature

Closes #24