Cleanup unnecessary null usage
Fix build
Merge branch 'master' of github.com:chriswk/isharelib2