PEN-1281 Fix zero checking in property value

Change-Id: Ie0205c4cf2e36c8a6f4b0fb0808801013199615a