XMPP -> Make error handling a little more bullet proof.