Merge pull request #1200 from mfleisz/master

Android: Fixed possible crash with a session being null