Index: DamClients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs
===================================================================
diff -u -r4539 -r4542
--- DamClients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs	(.../DamSpatialEditorDecorator.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs	(.../DamSpatialEditorDecorator.cs)	(revision 4542)
@@ -386,12 +386,14 @@
         {
             CurrentSoilProfile = locationJob.Location.GetSoilSurfaceProfile(FailureMechanismType, index, out probability);
             GeometryProbabilities = locationJob.Location.GetGeometryProbabilities(FailureMechanismType);
-            CsvExportData locResults = csvExportData;
-            if (locResults != null && (locResults.StabilityProfileName != CurrentSoilProfile.SoilProfile.Name))
+            // Use localCsvExportData to prevent timing issues with csvExportData being set to null with the improved DevExpress
+            // version. So do not remove this.
+            CsvExportData localCsvExportData = csvExportData;
+            if (localCsvExportData != null && (localCsvExportData.StabilityProfileName != CurrentSoilProfile.SoilProfile.Name))
             {
                 for (var i = 0; i < GeometryProbabilitiesCount; i++)
                 {
-                    if (GeometryProbabilities[i].SoilGeometryName == locResults.StabilityProfileName)
+                    if (GeometryProbabilities[i].SoilGeometryName == localCsvExportData.StabilityProfileName)
                     {
                         CurrentSoilProfile = locationJob.Location.GetSoilSurfaceProfile(FailureMechanismType, i, out probability);
                         index = i;