Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs
===================================================================
diff -u -r668 -r670
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 668)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 670)
@@ -497,14 +497,8 @@
             
             Assert.AreEqual(false, context.IsEnabled(geometryEditor, "DeleteSelectedObjects"));
 
-            try
-            {
-                geometryEditor.Dispose();
-            }
-            finally
-            {
-                BindSupport.ClearCaches();    
-            }
+            geometryEditor.Dispose();
+            BindSupport.ClearCaches();    
         }
 
         [Test, Category("Work_In_Progress")]
@@ -514,14 +508,8 @@
             var plugin = new DSoilModelPlugin();
 
             Assert.AreEqual(false, context.IsVisible(plugin, "OldProjectImport"));
-            try
-            {
-                plugin.Dispose();
-            }
-            finally
-            {
-                BindSupport.ClearCaches();
-            }
+            plugin.Dispose();
+            BindSupport.ClearCaches();
         }
     }
 }
Index: src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs
===================================================================
diff -u -r667 -r670
--- src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs	(.../DSoilModelPlugin.cs)	(revision 667)
+++ src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs	(.../DSoilModelPlugin.cs)	(revision 670)
@@ -230,12 +230,16 @@
 
         public void Dispose()
         {
-            materialsTable.CanDelete = null;
-            cptsTable.CanDelete = null;
-            boringsTable.CanDelete = null;
-            soilProfiles1DTable.CanDelete = null;
-            soilProfiles2DTable.CanDelete = null;
 
+            if (materialsTable != null)
+            {
+                materialsTable.CanDelete = null;
+                cptsTable.CanDelete = null;
+                boringsTable.CanDelete = null;
+                soilProfiles1DTable.CanDelete = null;
+                soilProfiles2DTable.CanDelete = null;
+            }
+
             if (null != GeometryEditor)
             {
                 GeometryEditor.Dispose();