Added check for property existence.