Modified error message

Jira-issue: WP-1175