we should ONLY be saving the address if this isn't a catchall connection...