Index: Core/Components/src/Core.Components.Gis/Data/FeatureBasedMapData.cs
===================================================================
diff -u -rc4ad0672cee580dfc9a2835dcb2a39e92a49280f -r0a8ca85c3cd07479f7fe3753141f2c13aa47c665
--- Core/Components/src/Core.Components.Gis/Data/FeatureBasedMapData.cs	(.../FeatureBasedMapData.cs)	(revision c4ad0672cee580dfc9a2835dcb2a39e92a49280f)
+++ Core/Components/src/Core.Components.Gis/Data/FeatureBasedMapData.cs	(.../FeatureBasedMapData.cs)	(revision 0a8ca85c3cd07479f7fe3753141f2c13aa47c665)
@@ -120,18 +120,25 @@
         /// <param name="name">The name of the <see cref="FeatureBasedMapData"/>.</param>
         /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is 
         /// <c>null</c> or only whitespace.</exception>
-        protected FeatureBasedMapData(string name) : this(name, null) {}
+        protected FeatureBasedMapData(string name) : base(name) {}
 
         /// <summary>
         /// Creates a new instance of <see cref="FeatureBasedMapData{T}"/>.
         /// </summary>
         /// <param name="name">The name of the <see cref="FeatureBasedMapData"/>.</param>
         /// <param name="theme">The <see cref="MapTheme{TCategoryTheme}"/>
         /// belonging to the <see cref="FeatureBasedMapData"/>.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="theme"/>
+        /// is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is 
         /// <c>null</c> or only whitespace.</exception>
-        protected FeatureBasedMapData(string name, MapTheme<TCategoryTheme> theme) : base(name)
+        protected FeatureBasedMapData(string name, MapTheme<TCategoryTheme> theme) : this(name)
         {
+            if (theme == null)
+            {
+                throw new ArgumentNullException(nameof(theme));
+            }
+
             Theme = theme;
         }
 
Index: Core/Components/src/Core.Components.Gis/Data/MapLineData.cs
===================================================================
diff -u -r2f5fc74d129a8b1c3410c3d256f33f84a26e8dfd -r0a8ca85c3cd07479f7fe3753141f2c13aa47c665
--- Core/Components/src/Core.Components.Gis/Data/MapLineData.cs	(.../MapLineData.cs)	(revision 2f5fc74d129a8b1c3410c3d256f33f84a26e8dfd)
+++ Core/Components/src/Core.Components.Gis/Data/MapLineData.cs	(.../MapLineData.cs)	(revision 0a8ca85c3cd07479f7fe3753141f2c13aa47c665)
@@ -51,8 +51,16 @@
         /// <c>null</c> or only whitespace.</exception>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="style"/>
         /// is <c>null</c>.</exception>
-        public MapLineData(string name, LineStyle style) : this(name, style, null) {}
+        public MapLineData(string name, LineStyle style) : base(name)
+        {
+            if (style == null)
+            {
+                throw new ArgumentNullException(nameof(style));
+            }
 
+            Style = style;
+        }
+
         /// <summary>
         /// Creates a new instance of <see cref="MapLineData"/>.
         /// </summary>
Index: Core/Components/src/Core.Components.Gis/Data/MapPointData.cs
===================================================================
diff -u -r2f5fc74d129a8b1c3410c3d256f33f84a26e8dfd -r0a8ca85c3cd07479f7fe3753141f2c13aa47c665
--- Core/Components/src/Core.Components.Gis/Data/MapPointData.cs	(.../MapPointData.cs)	(revision 2f5fc74d129a8b1c3410c3d256f33f84a26e8dfd)
+++ Core/Components/src/Core.Components.Gis/Data/MapPointData.cs	(.../MapPointData.cs)	(revision 0a8ca85c3cd07479f7fe3753141f2c13aa47c665)
@@ -51,8 +51,16 @@
         /// <c>null</c> or only whitespace.</exception>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="style"/>
         /// is <c>null</c>.</exception>
-        public MapPointData(string name, PointStyle style) : this(name, style, null) {}
+        public MapPointData(string name, PointStyle style) : base(name)
+        {
+            if (style == null)
+            {
+                throw new ArgumentNullException(nameof(style));
+            }
 
+            Style = style;
+        }
+
         /// <summary>
         /// Creates a new instance of <see cref="MapPointData"/>.
         /// </summary>
Index: Core/Components/src/Core.Components.Gis/Data/MapPolygonData.cs
===================================================================
diff -u -r2f5fc74d129a8b1c3410c3d256f33f84a26e8dfd -r0a8ca85c3cd07479f7fe3753141f2c13aa47c665
--- Core/Components/src/Core.Components.Gis/Data/MapPolygonData.cs	(.../MapPolygonData.cs)	(revision 2f5fc74d129a8b1c3410c3d256f33f84a26e8dfd)
+++ Core/Components/src/Core.Components.Gis/Data/MapPolygonData.cs	(.../MapPolygonData.cs)	(revision 0a8ca85c3cd07479f7fe3753141f2c13aa47c665)
@@ -51,8 +51,16 @@
         /// <c>null</c> or only whitespace.</exception>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="style"/>
         /// is <c>null</c>.</exception>
-        public MapPolygonData(string name, PolygonStyle style) : this(name, style, null) {}
+        public MapPolygonData(string name, PolygonStyle style) : base(name)
+        {
+            if (style == null)
+            {
+                throw new ArgumentNullException(nameof(style));
+            }
 
+            Style = style;
+        }
+
         /// <summary>
         /// Creates a new instance of <see cref="MapPolygonData"/>.
         /// </summary>
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs
===================================================================
diff -u -rc4ad0672cee580dfc9a2835dcb2a39e92a49280f -r0a8ca85c3cd07479f7fe3753141f2c13aa47c665
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs	(.../FeatureBasedMapDataConverterTest.cs)	(revision c4ad0672cee580dfc9a2835dcb2a39e92a49280f)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs	(.../FeatureBasedMapDataConverterTest.cs)	(revision 0a8ca85c3cd07479f7fe3753141f2c13aa47c665)
@@ -772,7 +772,7 @@
 
         private class TestFeatureBasedMapData : FeatureBasedMapData<TestCategoryTheme>
         {
-            public TestFeatureBasedMapData(string name) : this(name, null) {}
+            public TestFeatureBasedMapData(string name) : base(name) {}
 
             public TestFeatureBasedMapData(string name, MapTheme<TestCategoryTheme> theme) : base(name, theme) {}
         }
Index: Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs
===================================================================
diff -u -rc4ad0672cee580dfc9a2835dcb2a39e92a49280f -r0a8ca85c3cd07479f7fe3753141f2c13aa47c665
--- Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs	(.../FeatureBasedMapDataTest.cs)	(revision c4ad0672cee580dfc9a2835dcb2a39e92a49280f)
+++ Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs	(.../FeatureBasedMapDataTest.cs)	(revision 0a8ca85c3cd07479f7fe3753141f2c13aa47c665)
@@ -150,6 +150,17 @@
         }
 
         [Test]
+        public void TypedConstructor_ThemeNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new TypedTestFeatureBasedMapData("name", null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("theme", exception.ParamName);
+        }
+
+        [Test]
         public void TypedConstructor_WitName_ExpectedValues()
         {
             // Setup
Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs
===================================================================
diff -u -rf7561a643a1fcf1760116b1bc93055e26f11aa8b -r0a8ca85c3cd07479f7fe3753141f2c13aa47c665
--- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs	(.../MapLineDataPropertiesTest.cs)	(revision f7561a643a1fcf1760116b1bc93055e26f11aa8b)
+++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs	(.../MapLineDataPropertiesTest.cs)	(revision 0a8ca85c3cd07479f7fe3753141f2c13aa47c665)
@@ -323,10 +323,9 @@
         public void DynamicVisibleValidationMethod_MapLineDataWithMapTheme_ReturnsExpectedValuesForRelevantProperties(bool hasMapTheme)
         {
             // Setup
-            MapTheme<LineCategoryTheme> mapTheme = hasMapTheme
-                               ? CreateMapTheme()
-                               : null;
-            var mapLineData = new MapLineData("Test", new LineStyle(), mapTheme);
+            MapLineData mapLineData = hasMapTheme
+                                          ? new MapLineData("Test", new LineStyle(), CreateMapTheme())
+                                          : new MapLineData("Test");
 
             var properties = new MapLineDataProperties(mapLineData, Enumerable.Empty<MapDataCollection>());
 
Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPointDataPropertiesTest.cs
===================================================================
diff -u -rf7561a643a1fcf1760116b1bc93055e26f11aa8b -r0a8ca85c3cd07479f7fe3753141f2c13aa47c665
--- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPointDataPropertiesTest.cs	(.../MapPointDataPropertiesTest.cs)	(revision f7561a643a1fcf1760116b1bc93055e26f11aa8b)
+++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPointDataPropertiesTest.cs	(.../MapPointDataPropertiesTest.cs)	(revision 0a8ca85c3cd07479f7fe3753141f2c13aa47c665)
@@ -359,10 +359,9 @@
         public void DynamicVisibleValidationMethod_MapPointDataWithMapTheme_ReturnsExpectedValuesForRelevantProperties(bool hasMapTheme)
         {
             // Setup
-            MapTheme<PointCategoryTheme> mapTheme = hasMapTheme
-                                                        ? CreateMapTheme()
-                                                        : null;
-            var mapPointData = new MapPointData("Test", new PointStyle(), mapTheme);
+            MapPointData mapPointData = hasMapTheme
+                                            ? new MapPointData("Test", new PointStyle(), CreateMapTheme())
+                                            : new MapPointData("Test");
 
             var properties = new MapPointDataProperties(mapPointData, Enumerable.Empty<MapDataCollection>());
 
Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPolygonDataPropertiesTest.cs
===================================================================
diff -u -rf7561a643a1fcf1760116b1bc93055e26f11aa8b -r0a8ca85c3cd07479f7fe3753141f2c13aa47c665
--- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPolygonDataPropertiesTest.cs	(.../MapPolygonDataPropertiesTest.cs)	(revision f7561a643a1fcf1760116b1bc93055e26f11aa8b)
+++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPolygonDataPropertiesTest.cs	(.../MapPolygonDataPropertiesTest.cs)	(revision 0a8ca85c3cd07479f7fe3753141f2c13aa47c665)
@@ -331,10 +331,9 @@
         public void DynamicVisibleValidationMethod_MapPolygonDataWithMapTheme_ReturnsExpectedValuesForRelevantProperties(bool hasMapTheme)
         {
             // Setup
-            MapTheme<PolygonCategoryTheme> mapTheme = hasMapTheme
-                                                          ? CreateMapTheme()
-                                                          : null;
-            var mapPolygonData = new MapPolygonData("Test", new PolygonStyle(), mapTheme);
+            MapPolygonData mapPolygonData = hasMapTheme
+                                                ? new MapPolygonData("Test", new PolygonStyle(), CreateMapTheme())
+                                                : new MapPolygonData("Test");
 
             var properties = new MapPolygonDataProperties(mapPolygonData, Enumerable.Empty<MapDataCollection>());