diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 20cdb46302..f15ec435fa 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1072,7 +1072,13 @@ namespace OpenSim.Region.Environment.Scenes
                                     heightvalue = 0;
 
                                 heightvalue = 100 - (heightvalue * 100) / 19;
-                                
+
+                                if (heightvalue > 255)
+                                    heightvalue = 255;
+
+                                if (heightvalue < 0)
+                                    heightvalue = 0;
+
                                 Color water = Color.FromArgb((int)heightvalue, (int)heightvalue, 255);
                                 mapbmp.SetPixel(x, (256 - y) - 1, water);
                             }