diff --git a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/GeneralBotCreator.java b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/GeneralBotCreator.java
index 2ce49f637..3018d07e3 100644
--- a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/GeneralBotCreator.java
+++ b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/GeneralBotCreator.java
@@ -27,7 +27,7 @@ public class GeneralBotCreator {
                     AIPlayer.deregister(bot.getUid());
                     return true;
                 }
-                System.out.println("Running script");
+
                 if (!bot.getPulseManager().hasPulseRunning())
                 {
                     botScript.runLoop();
diff --git a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/ScriptAPI.java b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/ScriptAPI.java
index 07000b01a..7a91baed0 100644
--- a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/ScriptAPI.java
+++ b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/ScriptAPI.java
@@ -26,14 +26,13 @@ public class ScriptAPI {
         double minDistance = Double.MAX_VALUE;
         for (Node e : RegionManager.forId(me.getLocation().getRegionId()).getPlanes()[me.getLocation().getZ()].getEntities())
         {
-            if (e != null && e.getName().equals(entityName) && distance(me, e) < minDistance && Pathfinder.find(me, e, false, Pathfinder.SMART).isSuccessful())
+            if (e != null && e.getName().equals(entityName) && distance(me, e) < minDistance && !Pathfinder.find(me, e).isMoveNear())
             {
                 entity = e;
                 minDistance = distance(me, e);
             }
         }
 
-        System.out.println("Start: " + me.getLocation() + ". End: " + entity.getLocation());
         return entity;
     }
 
diff --git a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/scriptrepository/ManThiever.java b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/scriptrepository/ManThiever.java
index 9e8c76fdc..2ab8693c8 100644
--- a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/scriptrepository/ManThiever.java
+++ b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/scriptrepository/ManThiever.java
@@ -8,6 +8,9 @@ public class ManThiever extends Script {
     public void runLoop() {
         Node man = scriptAPI.getNearestEntity(me, "Man");
 
-        man.getInteraction().handle(me, man.getInteraction().get(2));
+        if (man != null)
+        {
+            man.getInteraction().handle(me, man.getInteraction().get(2));
+        }
     }
 }