Added ctor nullchecks