I added the null checks in the ctor. Is that what you had in mind ?