Indeed I was worried about `null` - was this changed recently? I remember there used to be a problem here, but I could just be remembering wrong.