diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 1b564a6ae..ec39cffaf 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -156,7 +156,8 @@ class Epp::Domain < Domain
   def attrs_from(frame, current_user, action = nil)
     at = {}.with_indifferent_access
 
-    code = frame.css('registrant').first.try(:text)
+    registrant_frame = frame.css('registrant').first
+    code = registrant_frame.try(:text)
     if code.present?
       if action == 'chg' && registrant_change_prohibited?
         add_epp_error('2304', nil, DomainStatus::SERVER_REGISTRANT_CHANGE_PROHIBITED, I18n.t(:object_status_prohibits_operation))
@@ -168,8 +169,9 @@ class Epp::Domain < Domain
         add_epp_error('2303', 'registrant', code, [:registrant, :not_found])
       end
     else
-        add_epp_error('2306', nil, nil, [:registrant, :cannot_be_missing])
-    end
+      add_epp_error('2306', nil, nil, [:registrant, :cannot_be_missing])
+    end if registrant_frame
+
 
     at[:name] = frame.css('name').text if new_record?
     at[:registrar_id] = current_user.registrar.try(:id)