SCUFL2-97 Avoid propertyResource being set to null (who does that?)