Correctly handle null properties of resources even where the property uses a class.
Correctly handle null properties of resources even where the property uses a class.