Non null closure property

The closure property doesn’t apply super elegantly with `nil` in the mix.