Fix client boostrap.
Merge pull request #4 from imalberto/fix-handler

Fix client boostrap.