diff --git a/PROMS/DataLoader/Approve.cs b/PROMS/DataLoader/Approve.cs
index d26322ac..41bd99e2 100644
--- a/PROMS/DataLoader/Approve.cs
+++ b/PROMS/DataLoader/Approve.cs
@@ -23,16 +23,16 @@ namespace DataLoader
 				{
 					if (dvi.Procedures.Count > 0)
 					{
-						string approvedFolder = dvi.MyFolder.Title + @"\APPROVED";
-						if (Directory.Exists(approvedFolder))
-						{
-							if (frmMain.MySettings.OnlyThisSet)
+						if (!frmMain.MySettings.OnlyThisSet || frmMain.MySettings.ProcedureSetPath.ToUpper() == dvi.MyFolder.Title.ToUpper())
 							{
-								if (frmMain.MySettings.ProcedureSetPath.ToUpper() == dvi.MyFolder.Title.ToUpper())
-									rv |= BuildApprovedRevision(myStage, approvedFolder, dvi);
-							}
-							else
-								rv |= BuildApprovedRevision(myStage, approvedFolder, dvi);
+							string approvedFolder = dvi.MyFolder.Title + @"\APPROVED";
+							//B2012-094 fix
+							if (!Directory.Exists(approvedFolder)) frmMain.MyWarning = "**** " + dvi.MyFolder.Title + " Approved folder does not exist";
+							else if (!File.Exists(approvedFolder + @"\SET.DBF")) frmMain.MyWarning = "**** " + dvi.MyFolder.Title + " Approved Set.dbf does not exist";
+							else if (!File.Exists(approvedFolder + @"\USAGERO.DBF")) frmMain.MyWarning = "**** " + dvi.MyFolder.Title + " Approved UsageRO.dbf does not exist";
+							else if (!Directory.Exists(approvedFolder + @"\PDFS")) frmMain.MyWarning = "**** " + dvi.MyFolder.Title + " Approved Pdfs folder does not exist";
+							else if (Directory.GetFiles(approvedFolder + @"\PDFS","*.PDF").Length == 0) frmMain.MyWarning = "**** " + dvi.MyFolder.Title + " Approved Pdfs folder does not contain any pdf files";
+							else rv |= BuildApprovedRevision(myStage, approvedFolder, dvi);
 						}
 					}
 				}
@@ -230,10 +230,23 @@ namespace DataLoader
 				//ss = ItemInfo.ConvertToDisplayText(ss);
 				//ss = ss.Replace('\n', ';');
 
-				_ROValues.Add(roid, ItemInfo.ConvertToDisplayText(_Lookup.GetRoValue(roid)));
+				_ROValues.Add(roid, PrepareForXML(ItemInfo.ConvertToDisplayText(_Lookup.GetRoValue(roid))));
 			}
 			return _ROValues[roid];
 		}
+
+		private string PrepareForXML(string rovalue)
+		{
+			StringBuilder sb = new StringBuilder();
+			foreach (char c in rovalue)
+			{
+				if (c < ' ')
+					sb.Append(string.Format(@"\x{0:X4}", (int)c));
+				else
+					sb.Append(c);
+			}
+			return sb.ToString();
+		}
 		private string FormatROID(string roid)
 		{
 			if (roid.Length == 16 && roid.EndsWith("0000"))
@@ -378,6 +391,7 @@ namespace DataLoader
 			//    date += " " + time.Substring(0, 2) + ":" + time.Substring(3, 2);
 			//StartDateTime = System.DateTime.Parse(date);
 			StartDateTime = GetDTS(dr["DATE"].ToString(), dr["TIME"].ToString());
+			RevDate = StartDateTime.ToString("MM/dd/yyyy");
 			FixItems fis = new FixItems(new FileInfo(string.Format(@"{0}\{1}.fix", afpath, Entry)));
 			if (fis.Count > 0)
 			{