diff --git a/product/ERP5/Document/SimulationMovement.py b/product/ERP5/Document/SimulationMovement.py
index fe52ef852bc8b21be190e26ce45ae57717fd4f09..b662c5843ead1532e886c9eab9f3186a7bf49b6f 100755
--- a/product/ERP5/Document/SimulationMovement.py
+++ b/product/ERP5/Document/SimulationMovement.py
@@ -157,7 +157,7 @@ class SimulationMovement(Movement):
     try:
       parent_state = self.aq_parent.getSimulationState()
       return parent_to_movement_simulation_state[parent_state]
-    except:
+    except KeyError, AttributeError:
       LOG('ERP5 WARNING:',100, 'Could not acquire getSimulationState on %s' % self.getRelativeUrl())
       return None
 
@@ -464,9 +464,9 @@ class SimulationMovement(Movement):
       return 0
     # XXX Those properties are the same than defined in DeliveryBuilder.
     # We need to defined it only 1 time.
-    LOG('SimulationMovement.isDivergent',0,delivery.getPath())
-    LOG('SimulationMovement.isDivergent self.getStartDate()',0,self.getStartDate())
-    LOG('SimulationMovement.isDivergent delivery.getStartDate()',0,delivery.getStartDate())
+    #LOG('SimulationMovement.isDivergent',0,delivery.getPath())
+    #LOG('SimulationMovement.isDivergent self.getStartDate()',0,self.getStartDate())
+    #LOG('SimulationMovement.isDivergent delivery.getStartDate()',0,delivery.getStartDate())
     if self.getSourceSection()      != delivery.getSourceSection() or \
        self.getDestinationSection() != delivery.getDestinationSection() or \
        self.getSource()             != delivery.getSource() or \
@@ -501,8 +501,8 @@ class SimulationMovement(Movement):
     delivery_ratio = self.getDeliveryRatio()
     if delivery_ratio is not None:
       d_quantity *= delivery_ratio 
-    LOG('SimulationMovement.isDivergent d_quantity',0,d_quantity)
-    LOG('SimulationMovement.isDivergent quantity + d_error',0,quantity + d_error)
+    #LOG('SimulationMovement.isDivergent d_quantity',0,d_quantity)
+    #LOG('SimulationMovement.isDivergent quantity + d_error',0,quantity + d_error)
     if d_quantity != quantity + d_error:
       return 1
     return 0