Added additional check to make sure the ip and port don't get touched