Changes to validate other end point before connecting

Jira Issue: WP-123