When registered with our forums, feel free to send a "here I am" post here to differ human beings from SPAM bots.
...I tested your patch and can confirm it handles both cases as expected.So I'm ok about committing your entire patch.