Handle errors for /disco info requests
Merge branch 'master' into xep-0223