From 65619f2fa8a2709a4a86a6bf73835d57e443fe7c Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Fri, 21 May 2021 14:20:21 +0000
Subject: [PATCH] guard docauthor fields. Commit ready to merge.  - Legacy-Id:
 19026

---
 ietf/doc/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py
index 00a03991f..f5ddaa7d8 100644
--- a/ietf/doc/utils.py
+++ b/ietf/doc/utils.py
@@ -566,8 +566,8 @@ def update_documentauthors(doc, new_docauthors, by=None, basis=None):
         author_changes = []
         # Now fill in other author details
         author_changes.append(_change_field_and_describe(auth, 'email', docauthor.email))
-        author_changes.append(_change_field_and_describe(auth, 'affiliation', docauthor.affiliation))
-        author_changes.append(_change_field_and_describe(auth, 'country', docauthor.country))
+        author_changes.append(_change_field_and_describe(auth, 'affiliation', docauthor.affiliation or ''))
+        author_changes.append(_change_field_and_describe(auth, 'country', docauthor.country or ''))
         author_changes.append(_change_field_and_describe(auth, 'order', order + 1))
         auth.save()
         log.assertion('auth.email_id != "none"')