diff --git a/src/Storage/FileSystem.cs b/src/Storage/FileSystem.cs
index 9de1c60..5cf8e31 100644
--- a/src/Storage/FileSystem.cs
+++ b/src/Storage/FileSystem.cs
@@ -67,27 +67,20 @@ namespace OpenSim.Modules.DataValue.Storage
 
         private string getFilePath(String host, String index)
         {
-            SceneObjectGroup _host = m_scene.GetSceneObjectGroup(host);
+            string _nameSpace = host.Trim().ToUpper().Replace("-", "");
 
-            if (_host != null)
-            {
-                string _nameSpace = _host.GroupID.ToString().Trim().ToUpper().Replace("-", "");
+            if (!Directory.Exists(m_dataValueDirectory))
+                Directory.CreateDirectory(m_dataValueDirectory);
 
-                if (!Directory.Exists(m_dataValueDirectory))
-                    Directory.CreateDirectory(m_dataValueDirectory);
+            if (!Directory.Exists(m_dataValueDirectory + "/" + _nameSpace))
+                Directory.CreateDirectory(m_dataValueDirectory + "/" + _nameSpace);
 
-                if (!Directory.Exists(m_dataValueDirectory + "/" + _nameSpace))
-                    Directory.CreateDirectory(m_dataValueDirectory + "/" + _nameSpace);
+            string _storageKey = BitConverter.ToString(new MD5CryptoServiceProvider().ComputeHash(ASCIIEncoding.ASCII.GetBytes(index.Trim().ToUpper()))).Replace("-", "");
 
-                string _storageKey = BitConverter.ToString(new MD5CryptoServiceProvider().ComputeHash(ASCIIEncoding.ASCII.GetBytes(index.Trim().ToUpper()))).Replace("-", "");
+            if (m_enabledCompress)
+                return m_dataValueDirectory + "/" + _nameSpace + "/" + _storageKey + ".gz";
 
-                if (m_enabledCompress)
-                    return m_dataValueDirectory + "/" + _nameSpace + "/" + _storageKey + ".gz";
-
-                return m_dataValueDirectory + "/" + _nameSpace + "/" + _storageKey + ".txt";
-            }
-
-            return null;
+            return m_dataValueDirectory + "/" + _nameSpace + "/" + _storageKey + ".txt";
         }
     }
 }