Added check for port forward