Fix propertySet event handler (null case)