Added missing check in PropertyMappingFactory