Only loop through v2 gateways and attempt to add them in if they actually exist.  Fixes issue #1720