added Error handling on invalid query response from server
Merge branch 'jseip1679'
improved peerSetup interface and error handling