FIX: Not assuming something is not null, if it is not enforced in the constructor