diff --git a/org.adempiere.base/src/org/compiere/model/MInOut.java b/org.adempiere.base/src/org/compiere/model/MInOut.java
index d68b400cdc..fa9c414073 100644
--- a/org.adempiere.base/src/org/compiere/model/MInOut.java
+++ b/org.adempiere.base/src/org/compiere/model/MInOut.java
@@ -1340,13 +1340,16 @@ public class MInOut extends X_M_InOut implements DocAction
 				{						
 					if (!isReversal())
 					{
-						BigDecimal toDelivered = oLine.getQtyOrdered().subtract(oLine.getQtyDelivered());
-						if (sLine.getMovementQty().compareTo(toDelivered) > 0)
-							overReceipt = sLine.getMovementQty().subtract(toDelivered);
-						if (overReceipt.signum() != 0)
+						if (oLine != null)
 						{
-							sLine.setQtyOverReceipt(overReceipt);
-							sLine.saveEx();
+							BigDecimal toDelivered = oLine.getQtyOrdered().subtract(oLine.getQtyDelivered());
+							if (sLine.getMovementQty().compareTo(toDelivered) > 0)
+								overReceipt = sLine.getMovementQty().subtract(toDelivered);
+							if (overReceipt.signum() != 0)
+							{
+								sLine.setQtyOverReceipt(overReceipt);
+								sLine.saveEx();
+							}
 						}
 					}
 					else