Fix bug with forwarding addresses containing invalid characters