Updated setter methods to be more defensive :)