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