Does line 152 above need to say this function can now return 'Draft object or null' ?
(I wasn't allowed to comment on that line directly)