Refactor listBroker method
Fix
Merge pull request #92 from haio/master

Handle broker fail