diff --git a/LSL2/STPROC/WO_MAT_QA_SERVICES.txt b/LSL2/STPROC/WO_MAT_QA_SERVICES.txt
index 8fb274d..16c54d9 100644
--- a/LSL2/STPROC/WO_MAT_QA_SERVICES.txt
+++ b/LSL2/STPROC/WO_MAT_QA_SERVICES.txt
@@ -421,9 +421,11 @@ end service
 
 Service GetQAMetComplete(WOMatKey)
 
+	ErrorMsg = ''
+	Response = True$
+	
     If WOMatKey NE '' then
         If Rowexists('WO_MAT_QA', WOMatKey) then
-            Response   = ''
             QAMetRec   = Database_Services('ReadDataRow', 'WO_MAT_QA', WOMatKey, '', True$, 0, False$)
             Stages     = QAMetRec<WO_MAT_QA_STAGE$>
             Results    = QAMetRec<WO_MAT_QA_RESULT$>
@@ -436,16 +438,17 @@ Service GetQAMetComplete(WOMatKey)
                 end
             Until Response EQ False$
             Next I
-            If Response = '' then 
-                Response = Wo_Mat_Qa_Services('GetMUWaferQAComplete', WOMatKey)
-            end
         end else
             Response = True$
         end
     end else
-        Error_Services('Add', 'Missing WOMatKey parameter.')
+        ErrorMsg = 'Missing WOMatKey parameter.'
+        Response = False$
     end
     
+    If ErrorMsg NE '' then
+    	Error_Services('Add', ErrorMsg)
+    end
     
 end service
 
@@ -497,4 +500,3 @@ Service GetMUWaferQAComplete(WOMatKey)
 	
 end service
 
-