diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalOrderParameterDict.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalOrderParameterDict.xml
index 031f66c01c54d417f7ca11b066934af4c61ba303..a284b5a4def88c431e0eb4779103bd084972fa35 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalOrderParameterDict.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalOrderParameterDict.xml
@@ -59,11 +59,17 @@ if order_parameter_dict is None:\n
 \n
 shopping_cart = context.SaleOrder_getShoppingCart()\n
 shopping_cart_product_list = shopping_cart.SaleOrder_getShoppingCartItemList()\n
+\n
+if len(shopping_cart_product_list) == 0:\n
+  return None \n
+\n
 shopping_cart_price = float(shopping_cart.SaleOrder_getShoppingCartTotalPrice())\n
 taxes_amount = float(shopping_cart.SaleOrder_getShoppingCartTotalPrice(include_taxes=True, include_shipping=True)) - \\\n
                float(shopping_cart.SaleOrder_getShoppingCartTotalPrice(include_shipping=True));\n
 shipping = context.SaleOrder_getSelectedShippingResource()\n
 shipping_price = context.restrictedTraverse(shipping).getPrice()\n
+if shipping_price is None:\n
+  shipping_price = 0\n
 customer = context.SaleOrder_getShoppingCartCustomer()\n
 site_url = context.getWebSiteValue().absolute_url()\n
 \n
@@ -134,6 +140,7 @@ return order_parameter_dict\n
                             <string>None</string>
                             <string>shopping_cart</string>
                             <string>shopping_cart_product_list</string>
+                            <string>len</string>
                             <string>float</string>
                             <string>shopping_cart_price</string>
                             <string>True</string>
diff --git a/bt5/erp5_commerce/bt/revision b/bt5/erp5_commerce/bt/revision
index 70e1a64c23f0dc1eb79598f64221bd0c38f18b97..aca544d017fda52bacd14eecff279d5097137c6e 100644
--- a/bt5/erp5_commerce/bt/revision
+++ b/bt5/erp5_commerce/bt/revision
@@ -1 +1 @@
-144
\ No newline at end of file
+145
\ No newline at end of file