Comment 7 for bug 1764668

I have repeated the tests for the second part of patch as well - everything went as expected.

Although I haven't been able to hit the undefined guest scenario before. I'll make a couple of attempts more.