diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index 89f52cf100..3914d2ee80 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -121,6 +121,9 @@ namespace OpenSim.Framework.Configuration.XML
 
         public void Commit()
         {
+            if (fileName == null)
+                return;
+
             if (!Directory.Exists(Util.configDir()))
             {
                 Directory.CreateDirectory(Util.configDir());