diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_Production.java b/org.adempiere.base/src/org/compiere/acct/Doc_Production.java
index c99f1b985a..334459ddc2 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc_Production.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc_Production.java
@@ -197,12 +197,12 @@ public class Doc_Production extends Doc
 						fl = fact.createLine(line, 
 								account, 
 								as.getC_Currency_ID(), variance.negate()); 
-						fl.setQty(Env.ZERO);
 						if (fl == null) 
 						{ 
 							p_Error = "Couldn't post variance " + line.getLine() + " - " + line; 
 							return null; 
 						}
+						fl.setQty(Env.ZERO);
 					}
 					// costs = bomCost.negate();
 				}
diff --git a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java
index 61280eb085..aebfc1fcba 100644
--- a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java
+++ b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java
@@ -950,7 +950,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 	 */
 	private boolean performWork (Trx trx) throws Exception
 	{
-		log.info (m_node + " [" + trx.getTrxName() + "]");
+		log.info (m_node + " [" + (trx!=null ? trx.getTrxName() : "") + "]");
 		m_docStatus = null;
 		if (m_node.getPriority() != 0)		//	overwrite priority if defined
 			setPriority(m_node.getPriority());
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
index a1ce4ffe46..6611d958b0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
@@ -322,9 +322,9 @@ public class WTreeMaintenance extends TreeMaintenance implements IFormController
 		Treeitem ti = centerTree.getSelectedItem();
 		DefaultTreeNode<?> stn = (DefaultTreeNode<?>) ti.getValue();
 		MTreeNode tn = (MTreeNode)stn.getData();
-		log.info(tn.toString());
 		if (tn == null)
 			return;
+		log.info(tn.toString());
 		ListModel<Object> model = centerList.getModel();
 		int size = model.getSize();
 		int index = -1;