Small change to make sure property is set before accessing it.