I'll add a check for a `null` mapper