> I would expect null in this case.

That would complicate the code more, and after thinking about this I've reached the conclusion that it's probably nicer to do what you suggested initially anyway.