diff --git a/app/controllers/repp/v1/domains/renews_controller.rb b/app/controllers/repp/v1/domains/renews_controller.rb
index 1ba8db506..e77c2e2d0 100644
--- a/app/controllers/repp/v1/domains/renews_controller.rb
+++ b/app/controllers/repp/v1/domains/renews_controller.rb
@@ -40,7 +40,9 @@ module Repp
           @domain = Epp::Domain.find_by(registrar: registrar, name: params[:domain_id])
           @domain ||= Epp::Domain.find_by!(registrar: registrar, name_puny: params[:domain_id])
 
-          @domain
+          return @domain if @domain
+
+          raise ActiveRecord::RecordNotFound
         end
 
         def renew_params
diff --git a/app/models/actions/domain_renew.rb b/app/models/actions/domain_renew.rb
index ec8178e6f..3e9740335 100644
--- a/app/models/actions/domain_renew.rb
+++ b/app/models/actions/domain_renew.rb
@@ -15,19 +15,12 @@ module Actions
     end
 
     def renew
-      period = params[:period]
-      unit = params[:period_unit]
-
       task = Domains::BulkRenew::SingleDomainRenew.run(domain: domain,
         period: params[:period],
         unit: params[:period_unit],
         registrar: user)
 
-      return true if task
-
-      puts task.errors
-
-      false
+      task.valid?
     end
   end
 end