fix #858
fix a NullPointerException look like #950
Merge pull request #966 from bronze1man/pr-858

fix #858