More robust connection establishment