diff --git a/app/views/epp/contacts/info.xml.builder b/app/views/epp/contacts/info.xml.builder
index 3790544e1..965e2340a 100644
--- a/app/views/epp/contacts/info.xml.builder
+++ b/app/views/epp/contacts/info.xml.builder
@@ -52,7 +52,7 @@ xml.epp_head do
         xml.tag!('contact:crDate', @contact.created_at.try(:iso8601))
 
         if @contact.updated_at != @contact.created_at
-          xml.tag!('contact:upID', @contact.updator.registrar.code)
+          xml.tag!('contact:upID', @contact.updator.registrar.code) if @contact.updator.try(:registrar).present?
           xml.tag!('contact:upDate', @contact.updated_at.try(:iso8601))
         end
         # xml.tag!('contact:trDate', '123') if false
diff --git a/app/views/epp/domains/info.xml.builder b/app/views/epp/domains/info.xml.builder
index fd6bfeeb6..181eabc67 100644
--- a/app/views/epp/domains/info.xml.builder
+++ b/app/views/epp/domains/info.xml.builder
@@ -42,7 +42,7 @@ xml.epp_head do
         xml.tag!('domain:crDate', @domain.created_at.try(:iso8601))
 
         if @domain.updated_at != @domain.created_at
-          xml.tag!('domain:upID', @domain.updator.registrar.code)
+          xml.tag!('domain:upID', @domain.updator.registrar.code) if @domain.updator.try(:registrar).present?
           xml.tag!('domain:upDate', @domain.updated_at.try(:iso8601))
         end