fix null
Merge branch 'master' of github.com:liujingbreak/stockton