Handle case where port isn't included in remote_endpoint  [#84708072]

https://www.pivotaltracker.com/story/show/84708072