crash fixes
Merge branch 'hotfix/0.9.1'