[FR]: Adress possible crash from #14734 and PR #15313

[JesusRojass]

Description

Adress possible crash reported in #14734 with a more defensive approach per Pull Request #15313 Comments

Added defensive logic while keeping the good improvements made

API Proposal

No response

Firebase Product(s)

Performance

[google-oss-bot]

I couldn't figure out how to label this issue, so I've labeled it for a human to triage. Hang tight.

[JesusRojass]

Edit: Will do more research and look for a better solution for this while keeping and eye open if a crash ever happens