Bug 917973
Addind a retry and better messaging when you dont get a response from the find one
Merge pull request #1555 from danmcp/master

Bug 917973