OK, just the comment and code are in disagreement. I can do a quick check and see anyway.
Do you think that checking for `null` there is a good compromise?