Handle connection errors on the client site

closes #337
Increase timeout to 30 seconds