Not sure if a comment here got lost - apologies if you've already addressed this: is the `null` setting here required and, if so, should we have a test for that?