fix null pointer excepition
Merge pull request #28 from hijamoya/null

fix null pointer excepition