diff --git a/app/views/epp/contacts/_postal_info.xml.builder b/app/views/epp/contacts/_postal_info.xml.builder
index 24013389a..4310c2f37 100644
--- a/app/views/epp/contacts/_postal_info.xml.builder
+++ b/app/views/epp/contacts/_postal_info.xml.builder
@@ -4,11 +4,11 @@ xml.tag!('contact:postalInfo', type: 'int') do
   xml.tag!('contact:org', @contact.org_name)# if @contact.disclosure.try(:int_org_name)
   #if @contact.disclosure.try(:int_addr)
   xml.tag!('contact:addr') do
-    xml.tag!('contact:street', address.street) if address.street
+    xml.tag!('contact:street', address.street) if address
     #xml.tag!('contact:street', address.street2) if address.street2
     #xml.tag!('contact:street', address.street3) if address.street3
     xml.tag!('contact:cc', address.try(:country).try(:iso)) unless address.try(:country).nil?
-    xml.tag!('contact:city', address.city)
+    xml.tag!('contact:city', address.city) if address
   end
   #end
 end