diff --git a/lib/widgets/desktop/desktop_checkout.dart b/lib/widgets/desktop/desktop_checkout.dart
index 7998b81..12e3ff7 100644
--- a/lib/widgets/desktop/desktop_checkout.dart
+++ b/lib/widgets/desktop/desktop_checkout.dart
@@ -288,13 +288,11 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
   }
 
   Widget mainBody() {
-    final _bi = cartInfo?.businessInfo;
-    print('CK_DEBUG: bi=${_bi != null} shipTime=${_bi?.shippingTime} addr=${_bi?.address != null} name=${_bi?.name}');
     return ListView.builder(
       itemCount: 6,
       addAutomaticKeepAlives: true,
       itemBuilder: (BuildContext context, int position) {
-        var deliveryTimeInSeconds = (_bi?.shippingTime ?? 0) * 60 + (durationInTraffic != null ? durationInTraffic!.value ?? 0 : 0);
+        var deliveryTimeInSeconds = (cartInfo!.businessInfo!.shippingTime ?? 0) * 60 + (durationInTraffic != null ? durationInTraffic!.value ?? 0 : 0);
         print('aaa: $deliveryTimeInSeconds');
         DateTime now = DateTime.now();
         var formatter = DateFormat('H:mm');
diff --git a/lib/widgets/general/add_remove_button.dart b/lib/widgets/general/add_remove_button.dart
index 7b42241..f83ffb3 100644
--- a/lib/widgets/general/add_remove_button.dart
+++ b/lib/widgets/general/add_remove_button.dart
@@ -61,7 +61,7 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
   Widget build(BuildContext context) {
     if (widget.product!.leftNum == null) {
       _qty = 0;
-      cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business!)!;
+      cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business!);
       if (cartInfo != null) {
         for (var i = 0; i < cartInfo!.productList!.length; i++) {
           if (cartInfo!.productList![i].product!.id == widget.product!.id
@@ -102,7 +102,7 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
     }
     if (widget.addToBasket) {
       _qty = 0;
-      cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business!)!;
+      cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business!);
       if (cartInfo != null) {
         for (var i = 0; i < cartInfo!.productList!.length; i++) {
           if (cartInfo!.productList![i].product!.id == widget.product!.id) {
@@ -194,7 +194,7 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
       );
     } else {
       _qty = 0;
-      cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business!)!;
+      cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business!);
       if (cartInfo != null) {
         for (var i = 0; i < cartInfo!.productList!.length; i++) {
           if (cartInfo!.productList![i].product!.id == widget.product!.id) {