diff --git a/master/bt5/vifib_open_trade/WorkflowTemplateItem/portal_workflow/vifib_open_order_interaction_workflow/scripts/Delivery_assertCustomTradeConditionAndOpenOrder.xml b/master/bt5/vifib_open_trade/WorkflowTemplateItem/portal_workflow/vifib_open_order_interaction_workflow/scripts/Delivery_assertCustomTradeConditionAndOpenOrder.xml
index 8ad1bf4d54b8f739024d2e159e2224580481c737..bba20a22b2cf9e11b296cb79a96e70f1233f0fb4 100644
--- a/master/bt5/vifib_open_trade/WorkflowTemplateItem/portal_workflow/vifib_open_order_interaction_workflow/scripts/Delivery_assertCustomTradeConditionAndOpenOrder.xml
+++ b/master/bt5/vifib_open_trade/WorkflowTemplateItem/portal_workflow/vifib_open_order_interaction_workflow/scripts/Delivery_assertCustomTradeConditionAndOpenOrder.xml
@@ -78,8 +78,10 @@ if custom_trade_condition is None:\n
                                                                     destination_section_uid=order.getDestinationSectionUid(),\n
                                                                     title="ViFiB Custom Conditions")\n
 \n
-if order.getSpecialise() != custom_trade_condition.getRelativeUrl():\n
-  order.setSpecialiseValue(custom_trade_condition, portal_type="Sale Trade Condition")\n
+if custom_trade_condition is None:\n
+  raise ValueError(\'It was impossible to generate custom trade condition.\')\n
+if order.getSpecialise(portal_type="Sale Trade Condition") != custom_trade_condition.getRelativeUrl():\n
+  order.setSpecialiseValue(custom_trade_condition)\n
 \n
 if portal.portal_workflow.isTransitionPossible(custom_trade_condition, \'validate\'):\n
   custom_trade_condition.validate()\n
diff --git a/master/bt5/vifib_open_trade/bt/revision b/master/bt5/vifib_open_trade/bt/revision
index 83248fb9df4a244c41a10fa536045d5a8e759aee..aa59885c836ad82e8a621dbdde0bf9fb7a80c346 100644
--- a/master/bt5/vifib_open_trade/bt/revision
+++ b/master/bt5/vifib_open_trade/bt/revision
@@ -1 +1 @@
-142
\ No newline at end of file
+143
\ No newline at end of file