Better error reporting for discovery errors
Merge pull request #562 from deshipu/master

Better error reporting for discovery errors