diff --git a/app/controllers/repp/v1/base_controller.rb b/app/controllers/repp/v1/base_controller.rb
index 45144ca5a..5116a2238 100644
--- a/app/controllers/repp/v1/base_controller.rb
+++ b/app/controllers/repp/v1/base_controller.rb
@@ -21,34 +21,37 @@ module Repp
       end
 
       def epp_errors
-        @errors ||= []
+        @epp_errors ||= []
       end
 
       def handle_errors(obj = nil, update: false)
-        @errors ||= []
+        @epp_errors ||= []
 
         if obj
           obj.construct_epp_errors
-          @errors += obj.errors[:epp_errors]
+          @epp_errors += obj.errors[:epp_errors]
         end
 
         if update
-          @errors.each_with_index do |errors, index|
+          @epp_errors.each_with_index do |errors, index|
             next unless errors[:code] == '2304' && errors[:value].present? &&
                         errors[:value][:val] == DomainStatus::SERVER_DELETE_PROHIBITED &&
                         errors[:value][:obj] == 'status'
 
-            @errors[index][:value][:val] = DomainStatus::PENDING_UPDATE
+            @epp_errors[index][:value][:val] = DomainStatus::PENDING_UPDATE
           end
         end
 
-        @errors.uniq!
+        @epp_errors.uniq!
 
         render_epp_error
       end
 
       def render_epp_error
-        render(json: { code: @errors[0][:code], message: @errors[0][:msg] }, status: :bad_request)
+        render(
+          json: { code: @epp_errors[0][:code], message: @epp_errors[0][:msg] },
+          status: :bad_request
+        )
       end
 
       def ip_whitelisted?
diff --git a/app/controllers/repp/v1/contacts_controller.rb b/app/controllers/repp/v1/contacts_controller.rb
index b70e67c61..34099bd93 100644
--- a/app/controllers/repp/v1/contacts_controller.rb
+++ b/app/controllers/repp/v1/contacts_controller.rb
@@ -6,9 +6,8 @@ module Repp
       ## GET /repp/v1/contacts
       def index
         record_count = current_user.registrar.contacts.count
-        show_addresses = Contact.address_processing? && params[:details] == 'true'
         contacts = showable_contacts(params[:details], params[:limit] || 200,
-                                     params[:offset] || 0, show_addresses)
+                                     params[:offset] || 0)
 
         render(json: { contacts: contacts, total_number_of_records: record_count }, status: :ok)
       end
@@ -65,9 +64,9 @@ module Repp
           message: opt_addr? ? I18n.t('epp.contacts.completed_without_address') : nil }
       end
 
-      def showable_contacts(details, limit, offset, addresses)
+      def showable_contacts(details, limit, offset)
         contacts = current_user.registrar.contacts.limit(limit).offset(offset)
-        unless addresses
+        unless Contact.address_processing? && params[:details] == 'true'
           contacts = contacts.select(Contact.attribute_names - Contact.address_attribute_names)
         end