fixed null pointer exception
Merge branch 'master' of https://github.com/cwallet/coinwallet