Android: Bugfixes

Two more crash fixes.  I suggest we push these and the ones from yesterday as soon as we are convinced they are stable for us.