Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsProperties.cs
===================================================================
diff -u -rfc993257e220986c72398ceb79ffc388881d72bc -rdc16427d1cae3e6b9e09ddf1dabf01c2f024a8ce
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsProperties.cs	(.../HydraulicBoundaryLocationCalculationsProperties.cs)	(revision fc993257e220986c72398ceb79ffc388881d72bc)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsProperties.cs	(.../HydraulicBoundaryLocationCalculationsProperties.cs)	(revision dc16427d1cae3e6b9e09ddf1dabf01c2f024a8ce)
@@ -55,9 +55,16 @@
 
         public void Dispose()
         {
-            hydraulicBoundaryLocationCalculationsObserver.Dispose();
-
+            Dispose(true);
             GC.SuppressFinalize(this);
         }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                hydraulicBoundaryLocationCalculationsObserver.Dispose();
+            }
+        }
     }
 }
\ No newline at end of file