Adding property value set checks

Given that the persisted data may be an empty string, the
`@value || value` pattern did not work as expected.