diff --git a/LSL2/STPROC/OBJ_RDS.txt b/LSL2/STPROC/OBJ_RDS.txt
index 6eb0a93..35d5cb0 100644
--- a/LSL2/STPROC/OBJ_RDS.txt
+++ b/LSL2/STPROC/OBJ_RDS.txt
@@ -379,9 +379,9 @@ Create:
         RDS_Services('VerifyWOMatRDSNoIndex', RDSNo)
         RDS_Services('VerifyWOStepRDSKeyIndex', RDSNo)    
 	    
-		NewLotId = Lot_Services('CreateNewLot', 'RDS', '', WaferQty, SubPartNo, LotNo, SubVendCd, @User4, '', RDSNo)
-		
 		If Rds_Services('IsEpiPro', RDSNo) then
+		    NewLotId = Lot_Services('CreateNewLot', 'RDS', '', WaferQty, SubPartNo, LotNo, SubVendCd, @User4, '', RDSNo)
+		    
 		    Lot_Services('AddLotOperationIntoSequence', NewLotId, 'RDS_CREATE', 1, False$)
 		    Lot_Services('AddLotOperationIntoSequence', NewLotId, 'PRE_EPI', 2, False$)
 		    Lot_Services('AddLotOperationIntoSequence', NewLotId, 'REACTOR_RUN', 3, False$)
@@ -1254,3 +1254,4 @@ CalcThickTarget:
 	
 RETURN
 
+
diff --git a/LSL2/STPROC/PACKAGING_SERVICES.txt b/LSL2/STPROC/PACKAGING_SERVICES.txt
index 96a2e0d..a85887c 100644
--- a/LSL2/STPROC/PACKAGING_SERVICES.txt
+++ b/LSL2/STPROC/PACKAGING_SERVICES.txt
@@ -157,12 +157,15 @@ Service CompletePackaging(CassetteID, OperatorID, BaggerIdentifier)
             
             //Handle NG lot functions.
             If LotId NE '' then
-                NewPackRecId = Packaging_Services('CreatePackagingRecord', LotId, UserID, ToolID)
+                
                 CurrOperationId = Lot_Services('GetLotCurrOperationId', LotId)
                 If CurrOperationId NE '' then
-                    Packaging_Services('AddPackToLotOperation', CurrOperationId, NewPackRecId, UserID)
+                    NewPackRecId = Packaging_Services('CreatePackagingRecord', LotId, UserID, ToolID)
                     If Error_Services('NoError') then
-                        Lot_Services('MoveOutLot', LotId, UserId)
+                        Packaging_Services('AddPackToLotOperation', CurrOperationId, NewPackRecId, UserID)
+                        If Error_Services('NoError') then
+                            Lot_Services('MoveOutLot', LotId, UserId)
+                        end
                     end
                 end
                 
@@ -765,3 +768,4 @@ Service AddPackToLotOperation(LotOperationId, PackagingId, UserId)
     
 end service
 
+