Fix constructors to preserve behavior if null is explicitely passed