Fixes bug in property mappers where no null checks were done on keys