Fix for instance connectivity checks

Change-Id: If3477746bf23b52898dfbdd13bd712836c369359