Prevent bad calls bringing down the whole system
0.10.2
Merge branch 'master' of github.com:lloydwatkin/xmpp-ftw-demo

Conflicts:
	package.json