1124625 - fail quickly if there is a connection error
Merge pull request #24 from asmacdo/1124625

1124625 - fail quickly if there is a connection error