Deal with null in constructor