Initial work

No, as per the spec returning null is the correct way to handle this.