fix possible app crash
Merge branch 'master' of https://github.com/hapn-at/hapn-at