Index: Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs
===================================================================
diff -u -r555c08c6f506516d96076f33c1d6d4c4217b2a1c -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
--- Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 555c08c6f506516d96076f33c1d6d4c4217b2a1c)
+++ Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6a2a618c5c06dcc94b092420bda2b193cfd2663a)
@@ -920,20 +920,20 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Fout tijdens slepen/neerzetten: {0}..
+        ///   Looks up a localized string similar to Niet in staat om een presentatieobject te vinden voor niet geïnitialiseerd object..
         /// </summary>
-        internal static string TreeView_TreeViewDragDrop_Error_during_drag_drop_0_ {
+        internal static string TreeView_Error_Unable_to_resolve_node_presenter_for_null_data {
             get {
-                return ResourceManager.GetString("TreeView_TreeViewDragDrop_Error_during_drag_drop_0_", resourceCulture);
+                return ResourceManager.GetString("TreeView_Error_Unable_to_resolve_node_presenter_for_null_data", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Niet in staat om node presenter te vinden voor &apos;null&apos; object..
+        ///   Looks up a localized string similar to Fout tijdens slepen/neerzetten: {0}..
         /// </summary>
-        internal static string TreeViewController_OnNodeChecked_Unable_to_resolve_node_presenter_for_null_data {
+        internal static string TreeView_TreeViewDragDrop_Error_during_drag_drop_0_ {
             get {
-                return ResourceManager.GetString("TreeViewController_OnNodeChecked_Unable_to_resolve_node_presenter_for_null_data", resourceCulture);
+                return ResourceManager.GetString("TreeView_TreeViewDragDrop_Error_during_drag_drop_0_", resourceCulture);
             }
         }
         
Index: Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx
===================================================================
diff -u -r555c08c6f506516d96076f33c1d6d4c4217b2a1c -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
--- Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx	(.../Resources.resx)	(revision 555c08c6f506516d96076f33c1d6d4c4217b2a1c)
+++ Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx	(.../Resources.resx)	(revision 6a2a618c5c06dcc94b092420bda2b193cfd2663a)
@@ -308,9 +308,6 @@
   <data name="TreeViewNodePresenterBase_OnNodeRenamed_OnNodeRenamed_must_be_implemented_in_derived_class" xml:space="preserve">
     <value>OnNodeRenamed moet zijn geimplementeerd in de afgeleide klasse.</value>
   </data>
-  <data name="TreeViewController_OnNodeChecked_Unable_to_resolve_node_presenter_for_null_data" xml:space="preserve">
-    <value>Niet in staat om node presenter te vinden voor 'null' object.</value>
-  </data>
   <data name="TreeViewController_TreeViewController_Tree_view_can_t_be_null" xml:space="preserve">
     <value>Structuurweergave mag niet leeg zijn.</value>
   </data>
@@ -421,4 +418,7 @@
   <data name="TableView_SetCellValueInternal_No_conversion_from_string_possible" xml:space="preserve">
     <value>Geen conversie van het type 'string' mogelijk.</value>
   </data>
+  <data name="TreeView_Error_Unable_to_resolve_node_presenter_for_null_data" xml:space="preserve">
+    <value>Niet in staat om een presentatieobject te vinden voor niet geïnitialiseerd object.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs
===================================================================
diff -u -r275f55bd5c011375598d201bd95c02cb8da63dba -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
--- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs	(.../TreeView.cs)	(revision 275f55bd5c011375598d201bd95c02cb8da63dba)
+++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs	(.../TreeView.cs)	(revision 6a2a618c5c06dcc94b092420bda2b193cfd2663a)
@@ -9,7 +9,6 @@
 using System.Windows.Forms;
 using Core.Common.Controls.Swf.Properties;
 using log4net;
-using ValidationAspects;
 
 namespace Core.Common.Controls.Swf.TreeViewControls
 {
@@ -241,8 +240,12 @@
 
         public void EnsureVisible(object item) {}
 
-        public ITreeNodePresenter GetTreeViewNodePresenter([NotNull] object nodeData, ITreeNode node)
+        public ITreeNodePresenter GetTreeViewNodePresenter(object nodeData, ITreeNode node)
         {
+            if (nodeData == null)
+            {
+                throw new ArgumentNullException("nodeData", Resources.TreeView_Error_Unable_to_resolve_node_presenter_for_null_data);
+            }
             return controller.ResolveNodePresenterForData(nodeData, node == null ? null : node.Parent);
         }
 
Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewController.cs
===================================================================
diff -u -r4f50d51f0faba8e846bbaedcf64e39a814b8d975 -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
--- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewController.cs	(.../TreeViewController.cs)	(revision 4f50d51f0faba8e846bbaedcf64e39a814b8d975)
+++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewController.cs	(.../TreeViewController.cs)	(revision 6a2a618c5c06dcc94b092420bda2b193cfd2663a)
@@ -127,7 +127,7 @@
 
             if (node.Tag == null)
             {
-                throw new InvalidOperationException(Resources.TreeViewController_OnNodeChecked_Unable_to_resolve_node_presenter_for_null_data);
+                throw new InvalidOperationException(Resources.TreeView_Error_Unable_to_resolve_node_presenter_for_null_data);
             }
 
             node.Presenter.OnNodeChecked(node);
Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/TreeViewControls/TreeViewControllerTest.cs
===================================================================
diff -u -ra4acc4b43f7e9f0d8a6d5ec4e26ed46f325fb103 -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
--- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/TreeViewControls/TreeViewControllerTest.cs	(.../TreeViewControllerTest.cs)	(revision a4acc4b43f7e9f0d8a6d5ec4e26ed46f325fb103)
+++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/TreeViewControls/TreeViewControllerTest.cs	(.../TreeViewControllerTest.cs)	(revision 6a2a618c5c06dcc94b092420bda2b193cfd2663a)
@@ -143,7 +143,7 @@
         }
 
         [Test]
-        [ExpectedException(ExpectedMessage = "Niet in staat om node presenter te vinden voor 'null' object.")]
+        [ExpectedException(ExpectedMessage = "Niet in staat om een presentatieobject te vinden voor niet geïnitialiseerd object.")]
         public void TestOnNodeCheckedWithNodeWithoutTagValue()
         {
             var mocks = new MockRepository();
Index: Core/Common/uml/Core.Common.Controls.Swf.UML/Core.Common.Controls.Swf.UML.csproj
===================================================================
diff -u -r31d7b5552adb7b89eaf1552855f88c5df887e4f9 -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
--- Core/Common/uml/Core.Common.Controls.Swf.UML/Core.Common.Controls.Swf.UML.csproj	(.../Core.Common.Controls.Swf.UML.csproj)	(revision 31d7b5552adb7b89eaf1552855f88c5df887e4f9)
+++ Core/Common/uml/Core.Common.Controls.Swf.UML/Core.Common.Controls.Swf.UML.csproj	(.../Core.Common.Controls.Swf.UML.csproj)	(revision 6a2a618c5c06dcc94b092420bda2b193cfd2663a)
@@ -89,10 +89,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\TeeChart.dll</HintPath>
     </Reference>
-    <Reference Include="ValidationAspects, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cef13554f3ca1f2d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\ValidationAspects.dll</HintPath>
-    </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Core.Plugins.SharpMapGis.csproj
===================================================================
diff -u -rbc5c669eb6bf927e997d5b88b5c9eddd1ba87f00 -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
--- Core/Plugins/src/Core.Plugins.SharpMapGis/Core.Plugins.SharpMapGis.csproj	(.../Core.Plugins.SharpMapGis.csproj)	(revision bc5c669eb6bf927e997d5b88b5c9eddd1ba87f00)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/Core.Plugins.SharpMapGis.csproj	(.../Core.Plugins.SharpMapGis.csproj)	(revision 6a2a618c5c06dcc94b092420bda2b193cfd2663a)
@@ -76,14 +76,6 @@
       <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SharpVectorBindings, Version=0.3.1.27844, Culture=neutral, PublicKeyToken=a8855419d33ac940, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\Common\SharpMap.Extensions\SharpVectorBindings.dll</HintPath>
-    </Reference>
-    <Reference Include="SharpVectorCss, Version=0.3.1.27844, Culture=neutral, PublicKeyToken=a8855419d33ac940, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\Common\SharpMap.Extensions\SharpVectorCss.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
Index: lib/Common/SharpMap.Extensions/ProjNET.dll
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
Binary files differ
Index: lib/Common/SharpMap.Extensions/SharpVectorBindings.dll
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
Binary files differ
Index: lib/Common/SharpMap.Extensions/SharpVectorCss.dll
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
Binary files differ
Index: lib/Common/SharpMap.Extensions/SharpVectorDom.dll
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
Binary files differ
Index: lib/Common/SharpMap.Extensions/SharpVectorUtil.dll
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
Binary files differ
Index: lib/ValidationAspects.PostSharp.dll
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
Binary files differ
Index: lib/ValidationAspects.dll
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r6a2a618c5c06dcc94b092420bda2b193cfd2663a
Binary files differ