Avoid a couple of NPEs reported in Play Console