diff --git a/src/BasicPathFinding.cs b/src/BasicPathFinding.cs
index 9bfce32..21879be 100644
--- a/src/BasicPathFinding.cs
+++ b/src/BasicPathFinding.cs
@@ -223,19 +223,17 @@ namespace OpenSim.Modules.PathFinding
         [ScriptInvocation]
         public string osCreateNewPathFindingScene(UUID hostID, UUID scriptID)
         {
+            String imageName = UUID.Random().ToString();
+
             try
             {
                 SceneObjectGroup _host = m_scene.GetSceneObjectGroup(hostID);
 
                 if (_host != null || m_asyncCommands != null)
                 {
-                    String imageName = UUID.Random().ToString();
-
                     UUID tid = m_asyncCommands.DataserverPlugin.RegisterRequest(_host.LocalId, _host.GroupID, imageName);
 
                     (new Thread(delegate () { createPathFindingScene(imageName); })).Start();
-
-                    return imageName;
                 }
                 else
                 {
@@ -252,7 +250,7 @@ namespace OpenSim.Modules.PathFinding
                 m_log.Error(_error.StackTrace);
             }
 
-            return UUID.Zero.ToString();
+            return imageName;
 
         }
         #endregion