Checking for port number and added DEFAULT_ prefix

Based on the suggestions in the PR.