Adding explicit null check for BeanPropertyMap, to improve troubleshooting