Client now will wait until network is up instead of crashing