diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 59e168f93c..37c30fd345 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -214,10 +214,11 @@ namespace pCampBot
             if (!updatedBehaviours.TryGetValue(abbreviatedName, out behaviour))
                 return false;
 
-            behaviour.Close();
             updatedBehaviours.Remove(abbreviatedName);
             Behaviours = updatedBehaviours;
 
+            behaviour.Close();
+
             return true;
         }
 
@@ -299,7 +300,7 @@ namespace pCampBot
             ConnectionState = ConnectionState.Disconnecting;
               
             foreach (IBehaviour behaviour in Behaviours.Values)
-                behaviour.Interrupt();
+                behaviour.Close();
 
             Client.Network.Logout();
         }