v2.2; Fixed NRE when mapping null property.