add null pointer handling
Merge branch 'master' of https://github.com/k-kojak/yako
Merge branch 'master' of https://github.com/k-kojak/yako