Added some validation in ocean