Merge pull request #210 from csmith/master

Don't use addNonCriticalCallback.
Stop the XMPP parser passing null to callbacks.