diff --git a/app/controllers/epp/domains_controller.rb b/app/controllers/epp/domains_controller.rb
index 57136be63..db47570d2 100644
--- a/app/controllers/epp/domains_controller.rb
+++ b/app/controllers/epp/domains_controller.rb
@@ -68,8 +68,12 @@ class Epp::DomainsController < EppController
       else
         handle_errors(@domain)
       end
-    rescue
-      handle_errors(@domain)
+    rescue => e
+      if @domain.errors.any?
+        handle_errors(@domain)
+      else
+        throw e
+      end
     end
   end