refactor abit adding error checking to missing parts
Merge branch 'master' of https://github.com/designcreateplay/NodeBB