Rethrowing XmlExceptions as IcdXmlExceptions

ICD.Common.Utils/Xml/IcdXmlDocument.cs

@@ -28,7 +28,7 @@ namespace ICD.Common.Utils.Xml
 			}
 			catch (XmlException e)
 			{
-				throw new IcdXmlException(e.Message, e, e.LineNumber, e.LinePosition);
+				throw new IcdXmlException(e);
 			}
 		}
 

ICD.Common.Utils/Xml/IcdXmlException.cs

@@ -1,4 +1,9 @@
 using System;
+#if SIMPLSHARP
+using Crestron.SimplSharp;
+#else
+using System.Xml;
+#endif
 
 namespace ICD.Common.Utils.Xml
 {
@@ -20,5 +25,14 @@ namespace ICD.Common.Utils.Xml
 			m_LineNumber = lineNumber;
 			m_LinePosition = linePosition;
 		}
+
+		/// <summary>
+		/// Constructor.
+		/// </summary>
+		/// <param name="inner"></param>
+		public IcdXmlException(XmlException inner)
+			: this(inner.Message, inner, inner.LineNumber, inner.LinePosition)
+		{
+		}
 	}
 }

ICD.Common.Utils/Xml/IcdXmlReader.cs

@@ -49,28 +49,56 @@ namespace ICD.Common.Utils.Xml
 		#region Methods
 
 		public bool MoveToNextAttribute()
+		{
+			try
 			{
 				return m_Reader.MoveToNextAttribute();
 			}
+			catch (XmlException e)
+			{
+				throw new IcdXmlException(e);
+			}
+		}
 
 		public void MoveToElement()
+		{
+			try
 			{
 				m_Reader.MoveToElement();
 			}
+			catch (XmlException e)
+			{
+				throw new IcdXmlException(e);
+			}
+		}
 
 		public string GetAttribute(string name)
+		{
+			try
 			{
 				return m_Reader.GetAttribute(name);
 			}
+			catch (XmlException e)
+			{
+				throw new IcdXmlException(e);
+			}
+		}
 
 		public string ReadString()
 		{
+			try
+			{
 #if SIMPLSHARP
 				return m_Reader.ReadString();
 #else
 				return m_Reader.ReadElementContentAsString();
 #endif
 			}
+			catch (XmlException e)
+			{
+				throw new IcdXmlException(e);
+			}
+		}
 
 		public bool Read()
 		{
@@ -80,48 +108,97 @@ namespace ICD.Common.Utils.Xml
 			}
 			catch (XmlException e)
 			{
-				throw new IcdXmlException(e.Message, e, e.LineNumber, e.LinePosition);
+				throw new IcdXmlException(e);
 			}
 		}
 
 		public void Dispose()
 		{
+			try
+			{
 #if SIMPLSHARP
 				m_Reader.Dispose(true);
 #else
 				m_Reader.Dispose();
 #endif
 			}
+			catch (XmlException e)
+			{
+				throw new IcdXmlException(e);
+			}
+		}
 
 		public void Skip()
+		{
+			try
 			{
 				m_Reader.Skip();
 			}
+			catch (XmlException e)
+			{
+				throw new IcdXmlException(e);
+			}
+		}
 
 		public string ReadElementContentAsString()
+		{
+			try
 			{
 				return m_Reader.ReadElementContentAsString();
 			}
+			catch (XmlException e)
+			{
+				throw new IcdXmlException(e);
+			}
+		}
 
 		public string ReadOuterXml()
+		{
+			try
 			{
 				return m_Reader.ReadOuterXml();
 			}
+			catch (XmlException e)
+			{
+				throw new IcdXmlException(e);
+			}
+		}
 
 		public string ReadInnerXml()
+		{
+			try
 			{
 				return m_Reader.ReadInnerXml();
 			}
+			catch (XmlException e)
+			{
+				throw new IcdXmlException(e);
+			}
+		}
 
 		public long ReadElementContentAsLong()
+		{
+			try
 			{
 				return m_Reader.ReadElementContentAsLong();
 			}
+			catch (XmlException e)
+			{
+				throw new IcdXmlException(e);
+			}
+		}
 
 		public float ReadElementContentAsFloat()
+		{
+			try
 			{
 				return m_Reader.ReadElementContentAsFloat();
 			}
+			catch (XmlException e)
+			{
+				throw new IcdXmlException(e);
+			}
+		}
 
 		#endregion
 	}

ICD.Common.Utils/Xml/XmlUtils.cs

@@ -135,6 +135,9 @@ namespace ICD.Common.Utils.Xml
 		[PublicAPI]
 		public static void Recurse(string xml, Action<XmlRecursionEventArgs> callback)
 		{
+			if (callback == null)
+				throw new ArgumentNullException("callback");
+
 			Recurse(xml, new Stack<string>(), callback);
 		}
 
@@ -146,6 +149,12 @@ namespace ICD.Common.Utils.Xml
 		/// <param name="callback"></param>
 		private static void Recurse(string xml, Stack<string> path, Action<XmlRecursionEventArgs> callback)
 		{
+			if (path == null)
+				throw new ArgumentNullException("path");
+
+			if (callback == null)
+				throw new ArgumentNullException("callback");
+
 			IcdXmlReader childReader;
 
 			try