Index: Core/Components/src/Core.Components.DotSpatial/BaseMap.cs
===================================================================
diff -u -reff23cd289c9dfc4d626a76cac16477cebfdb0fe -r37dc25947c67f84a31ca868d2acceec4f48721cc
--- Core/Components/src/Core.Components.DotSpatial/BaseMap.cs	(.../BaseMap.cs)	(revision eff23cd289c9dfc4d626a76cac16477cebfdb0fe)
+++ Core/Components/src/Core.Components.DotSpatial/BaseMap.cs	(.../BaseMap.cs)	(revision 37dc25947c67f84a31ca868d2acceec4f48721cc)
@@ -50,9 +50,9 @@
         /// <summary>
         /// Gets and sets the <see cref="Data"/>. When <see cref="Data"/> is not empty it will load the data on the map.
         /// </summary>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="mapData"/> is null.</exception>
-        /// <exception cref="FileNotFoundException">Thrown when <paramref name="mapData"/> does not exist.</exception>
-        /// <exception cref="MapDataException">Thrown when the data in <paramref name="mapData"/> is not valid.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <see cref="MapData"/> is null.</exception>
+        /// <exception cref="FileNotFoundException">Thrown when <see cref="MapData"/> does not exist.</exception>
+        /// <exception cref="MapDataException">Thrown when the data in <see cref="MapData"/> is not valid.</exception>
         public MapData Data
         {
             get
@@ -68,7 +68,7 @@
 
                 if (value == null)
                 {
-                    throw new ArgumentNullException("mapData", "MapData is required when adding shapeFiles");
+                    throw new ArgumentNullException("MapData", "MapData is required when adding shapeFiles");
                 }
 
                 if (value.IsValid())
Index: Core/Components/test/Core.Components.DotSpatial.Test/BaseMapTest.cs
===================================================================
diff -u -reff23cd289c9dfc4d626a76cac16477cebfdb0fe -r37dc25947c67f84a31ca868d2acceec4f48721cc
--- Core/Components/test/Core.Components.DotSpatial.Test/BaseMapTest.cs	(.../BaseMapTest.cs)	(revision eff23cd289c9dfc4d626a76cac16477cebfdb0fe)
+++ Core/Components/test/Core.Components.DotSpatial.Test/BaseMapTest.cs	(.../BaseMapTest.cs)	(revision 37dc25947c67f84a31ca868d2acceec4f48721cc)
@@ -8,6 +8,8 @@
 using Core.Components.DotSpatial.Properties;
 using DotSpatial.Controls;
 using NUnit.Framework;
+using Rhino.Mocks;
+using Rhino.Mocks.Constraints;
 
 namespace Core.Components.DotSpatial.Test
 {
@@ -72,6 +74,20 @@
         }
 
         [Test]
+        public void SetData_ToNull_ThrowsArgrumentNullException()
+        {
+            // Setup
+            var map = new BaseMap();
+
+            // Call
+            TestDelegate testDelegate = () => map.Data = null;
+
+            // Assert
+            ArgumentNullException exception = Assert.Throws<ArgumentNullException>(testDelegate);
+            Assert.AreEqual("MapData", exception.ParamName);
+        }
+
+        [Test]
         public void Data_IsValid_DoesNotThrowException()
         {
             // Setup
@@ -88,6 +104,22 @@
         }
 
         [Test]
+        public void GetData_Always_ReturnsData()
+        {
+            // Setup
+            var map = new BaseMap();
+            var data = new MapData();
+            data.AddShapeFile(dijkvakgebiedenFile);
+            map.Data = data;
+
+            // Call
+            var getData = map.Data;
+
+            // Assert
+            Assert.AreSame(getData, data);
+        }
+
+        [Test]
         public void SetDataOnMap_Succeeds_AddOneMapLayerAndWriteLog()
         {
             // Setup
Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj
===================================================================
diff -u -rcd2cd8c2cfa9e88043c9dd10f843ba2d7fd81338 -r37dc25947c67f84a31ca868d2acceec4f48721cc
--- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision cd2cd8c2cfa9e88043c9dd10f843ba2d7fd81338)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision 37dc25947c67f84a31ca868d2acceec4f48721cc)
@@ -102,6 +102,7 @@
   <ItemGroup>
     <Compile Include="BaseMapTest.cs" />
     <Compile Include="Data\MapDataTest.cs" />
+    <Compile Include="Exceptions\MapDataExceptionTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Components/test/Core.Components.DotSpatial.Test/Exceptions/MapDataExceptionTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.DotSpatial.Test/Exceptions/MapDataExceptionTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Exceptions/MapDataExceptionTest.cs	(revision 37dc25947c67f84a31ca868d2acceec4f48721cc)
@@ -0,0 +1,57 @@
+using System;
+using Core.Components.DotSpatial.Exceptions;
+using Microsoft.Win32;
+using NUnit.Framework;
+
+namespace Core.Components.DotSpatial.Test.Exceptions
+{
+    [TestFixture]
+    public class MapDataExceptionTest
+    {
+        [Test]
+        public void DefaultConstructor_InnerExceptionNullAndMessageDefault()
+        {
+            // Setup
+            string expectedMessage = String.Format("Exception of type '{0}' was thrown.", typeof(MapDataException).FullName);
+
+            // Call
+            MapDataException exception = new MapDataException();
+
+            // Assert
+            Assert.IsInstanceOf<Exception>(exception);
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessage_InnerExceptionNullAndMessageSetToCustom()
+        {
+            // Setup
+            const string expectedMessage = "Some exception message";
+
+            // Call
+            MapDataException exception = new MapDataException(expectedMessage);
+
+            // Assert
+            Assert.IsInstanceOf<Exception>(exception);
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessageAndInnerException_InnerExceptionSetAndMessageSetToCustom()
+        {
+            // Setup
+            const string expectedMessage = "Some exception message";
+            Exception expectedInnerException = new Exception();
+
+            // Call
+            MapDataException exception = new MapDataException(expectedMessage, expectedInnerException);
+
+            // Assert
+            Assert.IsInstanceOf<Exception>(exception);
+            Assert.AreSame(expectedInnerException, exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+    }
+}
\ No newline at end of file