diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs
index 30ce28b2..b57a8fee 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs
@@ -1645,6 +1645,7 @@ namespace VEPROMS.CSLA.Library
 		private static void RemoveEnhancedFromConfig(ItemInfo tmp)
 		{
 			XmlDocument xd = new XmlDocument();
+			if (tmp.MyContent.Config == null || tmp.MyContent.Config == "") return;  // B2017-164 & B2017-172 check for null or empty config
 			xd.LoadXml(tmp.MyContent.Config);
 			XmlNode xn = xd.DocumentElement.SelectSingleNode("Enhanced");
 			if (xn != null)