Added error handling for /ping command responses
Merge branch 'master' into plugins