diff --git a/org.adempiere.base/src/org/compiere/model/MInvoice.java b/org.adempiere.base/src/org/compiere/model/MInvoice.java
index 501b8234b2..d14674c01f 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoice.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoice.java
@@ -1825,16 +1825,19 @@ public class MInvoice extends X_C_Invoice implements DocAction
 					MMatchPO po = MMatchPO.create (line, null,
 						getDateInvoiced(), matchQty);
 					boolean isNewMatchPO = false;
-					if (po.get_ID() == 0)
-						isNewMatchPO = true;
-					if (!po.save(get_TrxName()))
+					if (po != null) 
 					{
-						m_processMsg = "Could not create PO Matching";
-						return DocAction.STATUS_Invalid;
+						if (po.get_ID() == 0)
+							isNewMatchPO = true;
+						if (!po.save(get_TrxName()))
+						{
+							m_processMsg = "Could not create PO Matching";
+							return DocAction.STATUS_Invalid;
+						}
+						matchPO++;
+						if (isNewMatchPO)
+							addDocsPostProcess(po);
 					}
-					matchPO++;
-					if (isNewMatchPO)
-						addDocsPostProcess(po);
 				}
 			}
 
diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java
index 19896957d2..d459db8ec1 100644
--- a/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java
+++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java
@@ -474,11 +474,11 @@ public abstract class CreateFromInvoice extends CreateFrom
 								break;
 							}
 						}
-						if (inoutLine == null)
-						{
-							inoutLine = lines[0];	//	first as default
-							M_InOutLine_ID = inoutLine.getM_InOutLine_ID();
-						}
+//						if (inoutLine == null)
+//						{
+//							inoutLine = lines[0];	//	first as default
+//							M_InOutLine_ID = inoutLine.getM_InOutLine_ID();
+//						}
 					}
 				}
 				else if (M_RMALine_ID != 0)