Add MapAnonymous handling for null error_str
am: 486932a225

* commit '486932a225b21ffce9ba8557990d5ad4d135963d':
  Add MapAnonymous handling for null error_str