Merge "Add MapAnonymous handling for null error_str"