Fix a couple of issues and add reconnection

Errors are not properly propagated, throughout, and if the connection
closes, the next call will trigger a reconnect.