Fix crash.
Fix crash.
Merge pull request #620 from dosiecki/master

Android: Bugfixes