Index: DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
===================================================================
diff -u -r3342 -r3347
--- DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 3342)
+++ DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 3347)
@@ -161,7 +161,7 @@
                         else
                         {
                             damProjectData.CalculationMessages.Add(new LogMessage(LogMessageType.Warning, null,
-                                String.Format("Location '{0}' has no soilprofiles defined for the current failure mechanisme {1}", location.Name, 
+                                String.Format("Location '{0}' has no soil profiles defined for the current failure mechanism {1}", location.Name, 
                                     soilProbabilityFailureMechanismSystemType.ToString())));
                         }
                     }
Index: DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs
===================================================================
diff -u -r3342 -r3347
--- DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs	(.../UpliftLocationDeterminator.cs)	(revision 3342)
+++ DamEngine/branches/DamEngine 19.2/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs	(.../UpliftLocationDeterminator.cs)	(revision 3347)
@@ -192,20 +192,16 @@
             if((upliftFactorForBottomSandLayer == double.MaxValue) && (upliftFactorForInBetweenSandLayer == double.MaxValue))
                 return null;
 
+            if (SoilProfile == null)
+            {
+                SoilProfile = soilProfileInCurrentPoint;
+            }
             if (upliftFactorForBottomSandLayer < upliftFactorForInBetweenSandLayer)
             {
-                if (SoilProfile == null)
-                {
-                    SoilProfile = soilProfileInCurrentPoint;
-                }
                 return new UpliftLocationAndResult(point, upliftFactorForBottomSandLayer, soilProfileInCurrentPoint.BottomAquiferLayer.Name);
             }
             else
             {
-                if (SoilProfile == null)
-                {
-                    SoilProfile = soilProfileInCurrentPoint;
-                }
                 return new UpliftLocationAndResult(point, upliftFactorForInBetweenSandLayer, soilProfileInCurrentPoint.InBetweenAquiferLayer.Name);
             }
         }