Make sure if there is no Port # we don't append a ":" to the URL
Make sure if there is no Port # we don't append a ":" to the URL