Added is null checks on getter