[20180918193500] Wait Resiliency

Makes the logging associated with --wait resilient to temporary connection failures.