1620: Try to add some guards around possible nil objects based on associations in VPCs.
fix tabs