diff --git a/app/controllers/spree/credit_cards_controller.rb b/app/controllers/spree/credit_cards_controller.rb
index 9dd129bacf..36abcf71b9 100644
--- a/app/controllers/spree/credit_cards_controller.rb
+++ b/app/controllers/spree/credit_cards_controller.rb
@@ -26,6 +26,8 @@ module Spree
       else
         update_failed
       end
+      rescue ArgumentError => e
+        update_failed
     end
 
     def destroy