diff --git a/LSL2/STPROC/METROLOGY_SERVICES.txt b/LSL2/STPROC/METROLOGY_SERVICES.txt
index e0ad1e3..6732854 100644
--- a/LSL2/STPROC/METROLOGY_SERVICES.txt
+++ b/LSL2/STPROC/METROLOGY_SERVICES.txt
@@ -2553,12 +2553,17 @@ Service ImportBioRadEPPFQAData(RunData, FileName)
 	DataPoints[-1, 1] = ''    ; // Strip final @VM
 
 	If Error_Services('NoError') then
-		If Error_Services('HasError') then
-			Metrology_Services('LogResults', RDSNo@, Machine, 'UID001', Service : ' : ' : Error_Services('GetMessage'))
+		If DataSlotId NE '' then
+			If Num(DataSlotId) then 
+				// Update the WM_OUT record for EpiPro
+				WMORec<WM_OUT_MU_WAFER_THK_RESULT$, Int(DataSlotId)> = DataPoints
+				Database_Services('WriteDataRow', 'WM_OUT', WMOKeyID, WMORec, True$, False$, True$)
+			end else
+				Metrology_Services('LogResults', RDSNo@, Machine, 'UID001', Service : ' : DataSlotId ':Quote(DataSlotId):' is not a number!')
+			end
+		end else
+			Metrology_Services('LogResults', RDSNo@, Machine, 'UID001', Service : ' : DataSlotId is null!')
 		end
-		//Update the WM_OUT record for EpiPro
-		WMORec<WM_OUT_MU_WAFER_THK_RESULT$, DataSlotId> = DataPoints
-		Database_Services('WriteDataRow', 'WM_OUT', WMOKeyID, WMORec, True$, False$, True$)
 	end else
 		Metrology_Services('LogResults', RDSNo@, Machine, 'UID001', Service : ' : ' : Error_Services('GetMessage'))
 	end