Merge pull request #211 from csmith/master

Stop the XMPP parser passing null to callbacks.
Fix remaining null-passing method.