Catch errors if always_include_port is false
Merge pull request #202 from DylanLacey/master

Catch errors if always_include_port is not available