Fixes #1. No more waiting forever for a dead service.

The client implements polling so it won't hang forever.