diff --git a/make_post_sell/tests/test_functional.py b/make_post_sell/tests/test_functional.py
index be4f0bb..315652e 100644
--- a/make_post_sell/tests/test_functional.py
+++ b/make_post_sell/tests/test_functional.py
@@ -521,6 +521,61 @@ class AuthenticatedFunctionalTests(FunctionalTests):
             "Please enter your payment information.", res_csrf_checkout.body.decode()
         )
 
+    def test_cart_checkout_logic_with_none_stripe_user_shop(self):
+        """Test the specific logic that was causing AttributeError in cart checkout.
+        
+        This tests the exact conditions that led to the production bug:
+        stripe_user_shop.active_card when stripe_user_shop is None.
+        """
+        # Test the exact logic from cart.py lines 458 and 468
+        stripe_user_shop = None  # This is what causes the crash
+        
+        # OLD BUGGY CODE (would crash):
+        with self.assertRaises(AttributeError):
+            # This is the old buggy line that would crash:
+            if stripe_user_shop.active_card is None:  # AttributeError!
+                pass
+        
+        with self.assertRaises(AttributeError):
+            # This is the old buggy template context that would crash:
+            active_card = stripe_user_shop.active_card  # AttributeError!
+        
+        # NEW FIXED CODE (should work):
+        # Test line 458: if stripe_user_shop and stripe_user_shop.active_card is None:
+        try:
+            result1 = stripe_user_shop and stripe_user_shop.active_card is None
+            self.assertFalse(result1)  # Should be False, not crash
+        except AttributeError:
+            self.fail("Line 458 fix not working - still crashes on None stripe_user_shop")
+        
+        # Test line 468: "active_card": stripe_user_shop.active_card if stripe_user_shop else None,
+        try:
+            result2 = stripe_user_shop.active_card if stripe_user_shop else None
+            self.assertIsNone(result2)  # Should be None, not crash
+        except AttributeError:
+            self.fail("Line 468 fix not working - still crashes on None stripe_user_shop")
+        
+        # Test with a mock stripe_user_shop object to ensure normal flow still works
+        class MockStripeUserShop:
+            def __init__(self, active_card_value):
+                self.active_card = active_card_value
+        
+        stripe_user_shop_with_card = MockStripeUserShop("card_123")
+        stripe_user_shop_no_card = MockStripeUserShop(None)
+        
+        # Test normal cases still work
+        result3 = stripe_user_shop_with_card and stripe_user_shop_with_card.active_card is None
+        self.assertFalse(result3)  # Has card, so not None
+        
+        result4 = stripe_user_shop_no_card and stripe_user_shop_no_card.active_card is None
+        self.assertTrue(result4)  # No card, so is None
+        
+        result5 = stripe_user_shop_with_card.active_card if stripe_user_shop_with_card else None
+        self.assertEqual(result5, "card_123")
+        
+        result6 = stripe_user_shop_no_card.active_card if stripe_user_shop_no_card else None
+        self.assertIsNone(result6)
+
     @patch("make_post_sell.models.Product.is_ready", mock_always_true)
     def make_new_coupon_for_shop(self, coupon_params=None):
         # 1. log in as user1.