[minor] Move the client so we get "better" stack traces #55