diff --git a/openerp/addons/base/res/res_lang.py b/openerp/addons/base/res/res_lang.py
index 0a6f784189c..9eef42901a7 100644
--- a/openerp/addons/base/res/res_lang.py
+++ b/openerp/addons/base/res/res_lang.py
@@ -189,6 +189,10 @@ class lang(osv.osv):
         return grouping, thousands_sep, decimal_point
 
     def write(self, cr, uid, ids, vals, context=None):
+        if 'code' in vals:
+            for rec in self.browse(cr, uid, ids, context):
+                if rec.code != vals['code']:
+                    raise osv.except_osv(_('User Error'), _("Language code cannot be modified."))
         for lang_id in ids :
             self._lang_data_get.clear_cache(self)
         return super(lang, self).write(cr, uid, ids, vals, context)
diff --git a/openerp/workflow/instance.py b/openerp/workflow/instance.py
index 494214cd4b8..9d85b71f5cc 100644
--- a/openerp/workflow/instance.py
+++ b/openerp/workflow/instance.py
@@ -70,7 +70,12 @@ class WorkflowInstance(object):
         cr = self.session.cr
         cr.execute("select * from wkf_workitem where inst_id=%s", (self.instance['id'],))
         stack = []
-        for work_item_values in cr.dictfetchall():
+        for i, work_item_values in enumerate(cr.dictfetchall()):
+            if i > 0:
+                # test if previous workitem has already processed this one
+                cr.execute("select id from wkf_workitem where id=%s", (work_item_values['id'],))
+                if not cr.fetchone():
+                    continue
             wi = WorkflowItem(self.session, self.record, work_item_values)
             wi.process(signal=signal, force_running=force_running, stack=stack)
             # An action is returned