Fix for instance connectivity checks

Change-Id: I1384e40404f5f22833975059c8ddee214a8a74a5