Added check for not set value