1620: Try to add some guards around possible nil objects based on associations in VPCs.
1620: Try to add some guards around possible nil objects based on associations in VPCs.
fix tabs
Merge pull request #1647 from jessedavis/fog-1620

Fog #1620