Broadened the criteria for vlan to be != NONE