diff --git a/LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt b/LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt
index 5dd0495..1ca5426 100644
--- a/LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt
+++ b/LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt
@@ -243,24 +243,26 @@ Event PUB_SUBMIT.CLICK()
 		Quantity = TWRow<1,3>
 		ProdName = TWRow<1,2>
 		TWLot    = TWRow<1,1>
-		If Quantity NE '' AND TWLot NE '' then
-			if Num(Quantity) then
-			    Begin Case
-			        Case Quantity GT 0 AND Quantity LE 25
-			            TWLots<1, -1>    = TWRow<1,1>
-                        TWLotQtys<1, -1> = TWRow<1,3>
-                    Case Quantity GT 25
-                        NotReadyReason := 'Quantity value for test wafer lot ' : TWLot : ' must be less than 25.' : CRLF$
-                    Case Quantity LE 0
-                        NotReadyReason := 'Quantity value for test wafer lot ' : TWLot : ' must be greater than 0.' : CRLF$
-                    Case Otherwise$
-                        NotReadyReason := 'Quantity value for test wafer lot ' : TWLot : ' is invalid.' : CRLF$
-			    End Case
-			end else
-			   NotReadyReason := 'Quantity value for test wafer lot ' : TWLot : ' must be a number' : CRLF$
-			end
-		end else
-		    NotReadyReason := 'A quantity of test wafers used is required for test wafer lot ' : TWLot : CRLF$
+		If TWLot NE ''  then
+            If Quantity NE '' then
+                if Num(Quantity) then
+                    Begin Case
+                        Case Quantity GT 0 AND Quantity LE 25
+                            TWLots<1, -1>    = TWRow<1,1>
+                            TWLotQtys<1, -1> = TWRow<1,3>
+                        Case Quantity GT 25
+                            NotReadyReason := 'Quantity value for test wafer lot ' : TWLot : ' must be less than 25.' : CRLF$
+                        Case Quantity LE 0
+                            NotReadyReason := 'Quantity value for test wafer lot ' : TWLot : ' must be greater than 0.' : CRLF$
+                        Case Otherwise$
+                            NotReadyReason := 'Quantity value for test wafer lot ' : TWLot : ' is invalid.' : CRLF$
+                    End Case
+                end else
+                   NotReadyReason := 'Quantity value for test wafer lot ' : TWLot : ' must be a number' : CRLF$
+                end
+            end else
+                NotReadyReason := 'A quantity of test wafers used is required for test wafer lot ' : TWLot : CRLF$
+            end
 		end
 	Next TWRow
 	If NotReadyReason EQ '' then
@@ -336,3 +338,4 @@ return
 
 
 
+