Enum setter added Null check