fix a null references issues.
Merge branch 'master' of https://www.github.com/qianlifeng/wox