diff --git a/stock_delivery_planner/__manifest__.py b/stock_delivery_planner/__manifest__.py
index 322249b4..e492403b 100644
--- a/stock_delivery_planner/__manifest__.py
+++ b/stock_delivery_planner/__manifest__.py
@@ -1,7 +1,7 @@
 {
     'name': 'Stock Delivery Planner',
     'summary': 'Get rates and choose carrier for delivery.',
-    'version': '15.0.1.0.0',
+    'version': '15.0.1.1.0',
     'author': "Hibou Corp.",
     'category': 'Warehouse',
     'license': 'OPL-1',
diff --git a/stock_delivery_planner/models/stock.py b/stock_delivery_planner/models/stock.py
index a3d728af..5cf43780 100644
--- a/stock_delivery_planner/models/stock.py
+++ b/stock_delivery_planner/models/stock.py
@@ -47,3 +47,12 @@ class StockPicking(models.Model):
             domain.extend(tools.safe_eval(irconfig_parameter.get_param('sale.order.planner.carrier_domain')))
 
         return Carrier.search(domain)
+
+
+class Warehouse(models.Model):
+    _inherit = 'stock.warehouse'
+
+    delivery_planner_carrier_ids = fields.Many2many('delivery.carrier',
+                                                    relation='delivery_planner_carrier_wh_rel',
+                                                    string='Delivery Planner Base Carriers',
+                                                    help='Overrides the global carriers.')
diff --git a/stock_delivery_planner/views/stock_views.xml b/stock_delivery_planner/views/stock_views.xml
index a65334dd..137477e2 100644
--- a/stock_delivery_planner/views/stock_views.xml
+++ b/stock_delivery_planner/views/stock_views.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
+
     <record id="view_picking_form" model="ir.ui.view">
         <field name="name">stock.picking.form.inherit.delivery.planner</field>
         <field name="model">stock.picking</field>
@@ -10,4 +11,16 @@
             </xpath>
         </field>
     </record>
+
+    <record id="view_warehouse_delivery_carriers" model="ir.ui.view">
+        <field name="name">stock.warehouse.delivery.carriers</field>
+        <field name="model">stock.warehouse</field>
+        <field name="inherit_id" ref="stock.view_warehouse" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="delivery_planner_carrier_ids" options="{'no_create_edit': True, 'no_create': True}" />
+            </xpath>
+        </field>
+    </record>
+
 </odoo>
diff --git a/stock_delivery_planner/wizard/stock_delivery_planner.py b/stock_delivery_planner/wizard/stock_delivery_planner.py
index e18bd3f3..67695c56 100644
--- a/stock_delivery_planner/wizard/stock_delivery_planner.py
+++ b/stock_delivery_planner/wizard/stock_delivery_planner.py
@@ -1,7 +1,7 @@
 # Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
 
 from odoo import api, fields, models, _
-from odoo.tools import safe_eval
+from odoo.exceptions import UserError, ValidationError
 import logging
 _logger = logging.getLogger(__name__)
 
@@ -26,32 +26,37 @@ class StockDeliveryPlanner(models.TransientModel):
     def create(self, values):
         planner = super(StockDeliveryPlanner, self).create(values)
 
-        base_carriers = self.env['delivery.carrier']
-        carrier_ids = self.env['ir.config_parameter'].sudo().get_param('stock.delivery.planner.carrier_ids.%s' % (self.env.company.id, ))
-        if carrier_ids:
-            try:
-                carrier_ids = [int(c) for c in carrier_ids.split(',')]
-                base_carriers = base_carriers.browse(carrier_ids)
-            except:
-                pass
+        base_carriers = planner.picking_id.picking_type_id.warehouse_id.delivery_planner_carrier_ids
+        if not base_carriers:
+            carrier_ids = self.env['ir.config_parameter'].sudo().get_param('stock.delivery.planner.carrier_ids.%s' % (self.env.user.company_id.id, ))
+            if carrier_ids:
+                try:
+                    carrier_ids = [int(c) for c in carrier_ids.split(',')]
+                    base_carriers = base_carriers.browse(carrier_ids)
+                except:
+                    pass
+        base_carriers = base_carriers.sudo()
 
         for carrier in base_carriers:
-            rates = carrier.rate_shipment_multi(picking=planner.picking_id)
-            for rate in filter(lambda r: not r.get('success'), rates):
-                _logger.warning(rate.get('error_message'))
-            for rate in filter(lambda r: r.get('success'), rates):
-                rate = self.calculate_delivery_window(rate)
-                # added late in API dev cycle
-                package = rate.get('package') or self.env['stock.quant.package'].browse()
-                planner.plan_option_ids |= planner.plan_option_ids.create({
-                    'plan_id': self.id,
-                    'carrier_id': rate['carrier'].id,
-                    'package_id': package.id,
-                    'price': rate['price'],
-                    'date_planned': rate['date_planned'],
-                    'requested_date': rate['date_delivered'],
-                    'transit_days': rate['transit_days'],
-                })
+            try:
+                rates = carrier.rate_shipment_multi(picking=planner.picking_id)
+                for rate in filter(lambda r: not r.get('success'), rates):
+                    _logger.warning(rate.get('error_message'))
+                for rate in filter(lambda r: r.get('success'), rates):
+                    rate = self.calculate_delivery_window(rate)
+                    # added late in API dev cycle
+                    package = rate.get('package') or self.env['stock.quant.package'].browse()
+                    planner.plan_option_ids |= planner.plan_option_ids.create({
+                        'plan_id': self.id,
+                        'carrier_id': rate['carrier'].id,
+                        'package_id': package.id,
+                        'price': rate['price'],
+                        'date_planned': rate['date_planned'],
+                        'requested_date': rate.get('date_delivered', False),
+                        'transit_days': rate.get('transit_days', 0),
+                    })
+            except (UserError, ValidationError) as e:
+                _logger.warning('Exception during delivery planning. %s' % str(e))
         return planner
 
     @api.model
diff --git a/stock_delivery_planner/wizard/stock_delivery_planner_views.xml b/stock_delivery_planner/wizard/stock_delivery_planner_views.xml
index ac373043..06e9ac5c 100644
--- a/stock_delivery_planner/wizard/stock_delivery_planner_views.xml
+++ b/stock_delivery_planner/wizard/stock_delivery_planner_views.xml
@@ -11,6 +11,7 @@
                     <field name="plan_option_ids" nolabel="1">
                         <tree decoration-info="selection == 'selected'"
                               decoration-muted="selection == 'deselected'"
+                              decoration-bf="days_different == 0.0"
                               default_order="package_id, price"
                               create="false" edit="false" delete="false">
                             <field name="package_id" />