diff --git a/app/controllers/admin/dfc_product_imports_controller.rb b/app/controllers/admin/dfc_product_imports_controller.rb
index 3e1710f984..be55d822b0 100644
--- a/app/controllers/admin/dfc_product_imports_controller.rb
+++ b/app/controllers/admin/dfc_product_imports_controller.rb
@@ -38,8 +38,8 @@ module Admin
     rescue Rack::OAuth2::Client::Error => e
       flash[:error] = I18n.t(
         'admin.dfc_product_imports.index.oauth_error_html',
-        message: ActionController::Base.helpers.sanitize(e.message),
-        oidc_settings_link: ActionController::Base.helpers.link_to(
+        message: helpers.sanitize(e.message),
+        oidc_settings_link: helpers.link_to(
           I18n.t('spree.admin.tab.oidc_settings'), Rails.application.routes.url_helpers.admin_oidc_settings_path
         )
       ).html_safe
diff --git a/engines/dfc_provider/app/services/dfc_request.rb b/engines/dfc_provider/app/services/dfc_request.rb
index 0d067e173a..b9eb2083e1 100644
--- a/engines/dfc_provider/app/services/dfc_request.rb
+++ b/engines/dfc_provider/app/services/dfc_request.rb
@@ -86,6 +86,6 @@ class DfcRequest
         token: nil,
         refresh_token: nil
       )
-      throw e
+      raise
   end
 end