just spotted your NULLREF() (was it updated?)

No, was there from the beginning!

just that your code is wrong, you don't return a ref!

You're right, my mistake. I'll update it.