Comment 22 for bug 1789747

I have added a pullrequest for my branch. Regardless of whether it fixes all the things, I think it's a good thing to have, because it performs various sanity checks which should have been added anyway. And when last tested, it allowed me to login to Safari, which I could not do before.