fix crashes on android by adding null safety

[OneAboveAll1964]

in response to this issue

[markdevocht]

@OneAboveAll1964 , I've created an internal PR: #8269 with your changes and added some more safeties. Please have a look.

[OneAboveAll1964]

@markdevocht thanks for taking the time, and the changes you did look legit, my main concern making these changes was, if it doesnt crash then what would happen? because then we would have to rely on customer reports rather than crashylitics

and just for reference the two crashes these changes aim to fix are not small by any means

last 90 days on crashlytics ^

[markdevocht]

@OneAboveAll1964 so you're saying that I should take your PR as is? I have no problem with that.

[OneAboveAll1964]

@markdevocht no not at all, i was just asking if any of our changes will have implications, ofc you know better and your changes surely cover some cases i didn't think of, i was referring to both our changes not just yours

and in fact i have just moved your changes to our patch as well