diff --git a/ietf/idindex/index.py b/ietf/idindex/index.py
index 69b3fe48f..b413f3dbd 100644
--- a/ietf/idindex/index.py
+++ b/ietf/idindex/index.py
@@ -34,7 +34,8 @@ def all_id_txt():
     rfcs = dict()
     for rfc in Document.objects.filter(type_id="rfc"):
         draft = next(iter(rfc.related_that("became_rfc")), None)
-        rfcs[rfc.name] = draft.name if draft else rfc.name
+        if draft is not None:
+            rfcs[draft.name] = rfc.name
 
     replacements = dict(RelatedDocument.objects.filter(target__states=State.objects.get(type="draft", slug="repl"),
                                                        relationship="replaces").values_list("target__name", "source__name"))
diff --git a/ietf/idindex/tests.py b/ietf/idindex/tests.py
index 08a09e552..c55878378 100644
--- a/ietf/idindex/tests.py
+++ b/ietf/idindex/tests.py
@@ -41,7 +41,7 @@ class IndexTests(TestCase):
 
         # published
         draft.set_state(State.objects.get(type="draft", slug="rfc"))
-        rfc = RfcFactory(number=1234)
+        rfc = RfcFactory(rfc_number=1234)
         draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
 
         txt = all_id_txt()