Fix handling of null properties