fix #75
Merge branch 'hotfix/issue-75-app-shutdown-crash'