diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 3f4c958ce3..a3d237ffb8 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -141,6 +141,12 @@ namespace OpenSim.Services.Interfaces
                 }
             }
             set { 
+                if ( value == null)
+                {
+                    m_serverURI = String.Empty;
+                    return;
+                }
+
                 if ( value.EndsWith("/") ) {
                     m_serverURI = value;
                 } else {