Add robustness if can't connect on start up