diff --git a/LSL2/STPROC/WM_OUT_ACTIONS.txt b/LSL2/STPROC/WM_OUT_ACTIONS.txt
index 5403ec2..11cf7c2 100644
--- a/LSL2/STPROC/WM_OUT_ACTIONS.txt
+++ b/LSL2/STPROC/WM_OUT_ACTIONS.txt
@@ -342,8 +342,12 @@ WRITE_RECORD:
 		If CurrWaferCount GT 0 then
 			// Populate MAKEUP_WAFERS table
 			// Add/update cassette data to the MAKEUP_WAFERS table
-			WOMatKey                                    = {WO_MAT_KEY}
-			MUWfrRec                                    = ''
+			WOMatKey = {WO_MAT_KEY}
+			If RowExists('MAKEUP_WAFERS', WOMatKey) then
+				MUWfrRec = Database_Services('ReadDataRow', 'MAKEUP_WAFERS', WOMatKey)
+			end else
+				MUWfrRec = ''
+			end			
 			MUWfrRec<MAKEUP_WAFERS.SAP_BATCH_NO$>       = {SAP_BATCH_NO}
 			MUWfrRec<MAKEUP_WAFERS.PS_NO$>              = {PS_NO}
 			MUWfrRec<MAKEUP_WAFERS.CUST_NO$>            = Xlate('WO_LOG', WONo, 'CUST_NO', 'X')
diff --git a/LSL2/STPROC/WO_MAT_ACTIONS.txt b/LSL2/STPROC/WO_MAT_ACTIONS.txt
index 40e6fd7..aae5ec9 100644
--- a/LSL2/STPROC/WO_MAT_ACTIONS.txt
+++ b/LSL2/STPROC/WO_MAT_ACTIONS.txt
@@ -581,7 +581,11 @@ WRITE_RECORD:
             If CurrWaferCount GT 0 then
                 // Populate MAKEUP_WAFERS table
                 // Add/update cassette data to the MAKEUP_WAFERS table
-                MUWfrRec                                    = ''
+                If RowExists('MAKEUP_WAFERS', WOMatKeyID) then
+                	MUWfrRec = Database_Services('ReadDataRow', 'MAKEUP_WAFERS', WOMatKeyID)
+                end else
+                	MUWfrRec = ''
+                end
                 MUWfrRec<MAKEUP_WAFERS.SAP_BATCH_NO$>       = {SAP_BATCH_NO}
                 MUWfrRec<MAKEUP_WAFERS.PS_NO$>              = Xlate('WO_LOG', WONo, 'PS_NO', 'X')
                 MUWfrRec<MAKEUP_WAFERS.CUST_NO$>            = {CUST_NO}