diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index c710723812..a43a5f59f6 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -86,6 +86,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                 p_scene = scene;
                 p_cloneAppearanceFrom = cloneAppearanceFrom;
                 p_inUse = true;
+                p_returnUuid = UUID.Zero;
+            }
+
+            while(p_returnUuid == UUID.Zero)
+            {
+                Thread.Sleep(250);
             }
 
             m_createMutex.ReleaseMutex();