diff --git a/LSL2/STPROC/SIGNATURE_SERVICES.txt b/LSL2/STPROC/SIGNATURE_SERVICES.txt
index 43d601a..9598e29 100644
--- a/LSL2/STPROC/SIGNATURE_SERVICES.txt
+++ b/LSL2/STPROC/SIGNATURE_SERVICES.txt
@@ -260,17 +260,15 @@ Service CheckSigOrder(WOMatKey, CurrStage, UseCaching, RDSNo)
         Begin Case
             Case ( Not(MemberOf(@User4, 'BYPASS') ) and ( (CurrStage EQ 'QA') or (CurrStage EQ 'MO_QA') ) and (PrevStageSig EQ @User4) )
                 ErrorMsg = 'FQA stage signature cannot match previous step ':PrevStage:' signature. ':WOMatKey:' (':Service:')'
-                Error_Services('Add', ErrorMsg)
             Case PrevStageComp EQ False$
                 ErrorMsg = 'Previous step ':PrevStage:' is not signed. ':WOMatKey:' (':Service:')'
-                Error_Services('Add', ErrorMsg)
             Case CurrStageComp EQ True$
                 // Allow user to re-sign. This may be necessary in certain cases such as when multiple surfscans
                 // have taken place and one still needs to be signed.
                 Response = True$
             Case Error_Services('HasError') EQ True$
                 // Error message already in stack. 
-                Null 
+                ErrorMsg = Error_Services('GetMessage')
             Case Otherwise$
                 // Ok
                 Response = True$                       
@@ -282,6 +280,11 @@ Service CheckSigOrder(WOMatKey, CurrStage, UseCaching, RDSNo)
     
     EndTick = GetTickCount()
     Mona_Services('QueueLatencyAndCountMetrics', MonaResource, MetricName, StartTick, EndTick)
+    
+    If ErrorMsg NE '' then
+    	Error_Services('Add', ErrorMsg)
+    end
+    
 End Service
 
 
@@ -2921,3 +2924,4 @@ return
 
 
 
+