diff --git a/LSL2/STPROC/TEST_RUN_SERVICES.txt b/LSL2/STPROC/TEST_RUN_SERVICES.txt
index a395513..eca5790 100644
--- a/LSL2/STPROC/TEST_RUN_SERVICES.txt
+++ b/LSL2/STPROC/TEST_RUN_SERVICES.txt
@@ -497,7 +497,11 @@ Service CreateTestRunRecord(RunTypeID, EqpType, EqpID, PSNo, RDSNo, UserID, TWLo
                 ErrorMessage := 'User ID Missing. '
             end
         end    
-        end
+    end
+    
+    EndTick = GetTickCount()
+    Mona_Services('QueueLatencyAndCountMetrics', MonaResource, MetricName, StartTick, EndTick)
+    
     If ErrorMessage NE '' then
         LogData       = ''
         LogData<1, 1> = LoggingDTM
@@ -508,8 +512,7 @@ Service CreateTestRunRecord(RunTypeID, EqpType, EqpID, PSNo, RDSNo, UserID, TWLo
         Response      = ''
     end
     
-    EndTick = GetTickCount()
-    Mona_Services('QueueLatencyAndCountMetrics', MonaResource, MetricName, StartTick, EndTick)
+    
 end service
 
 Service CreateTestRunWaferRecord(TestRunID, TWPartID, TWUsageTypeID, SourceLotId, Username)
@@ -552,6 +555,10 @@ Service CreateTestRunWaferRecord(TestRunID, TWPartID, TWUsageTypeID, SourceLotId
             ErrorMessage := 'TWPartID parameter was not passed to CreateTestRunWaferRecord method. '
         end
     end
+    
+    EndTick = GetTickCount()
+    Mona_Services('QueueLatencyAndCountMetrics', MonaResource, MetricName, StartTick, EndTick)
+    
     If ErrorMessage NE ''  then
         LogData       = ''
         LogData<1, 1> = LoggingDTM
@@ -560,9 +567,7 @@ Service CreateTestRunWaferRecord(TestRunID, TWPartID, TWUsageTypeID, SourceLotId
         Logging_Services('AppendLog', objLogTR, LogData, @FM, @VM)
         Error_Services('Add', 'Error creating new test run record: ' : ErrorMessage)
     end
-    
-    EndTick = GetTickCount()
-    Mona_Services('QueueLatencyAndCountMetrics', MonaResource, MetricName, StartTick, EndTick)
+
 end service
 
 Service UseTWFromLot(LotId, UsageQty, Username)
@@ -832,3 +837,4 @@ end service
 
 
 
+