Added logic to verify we have not already considered this device.