diff --git a/app/controllers/spree/admin/payment_methods_controller_decorator.rb b/app/controllers/spree/admin/payment_methods_controller_decorator.rb
index aea47a05f3..bded58fe19 100644
--- a/app/controllers/spree/admin/payment_methods_controller_decorator.rb
+++ b/app/controllers/spree/admin/payment_methods_controller_decorator.rb
@@ -73,7 +73,8 @@ module Spree
       end
 
       def restrict_stripe_account_change
-        return unless @payment_method.try(:type) == "Spree::Gateway::StripeConnect"
+        return unless @payment_method
+        return unless @payment_method.type == "Spree::Gateway::StripeConnect"
         return unless @payment_method.preferred_enterprise_id.andand > 0
 
         @stripe_account_holder = Enterprise.find(@payment_method.preferred_enterprise_id)