Added the checks in ctor