I'm guessing this is the standard pattern: null check here but not in the builder..?