  #else
   #define VERBOSE(x) std::cout << x << std::endl
  #endif
-Index: src/fheroes2/kingdom/world.cpp
-===================================================================
---- src/fheroes2/kingdom/world.cpp	(revision 2761)
-+++ src/fheroes2/kingdom/world.cpp	(working copy)
-@@ -1028,12 +1028,22 @@
- 
- Heroes* World::GetHeroes(Heroes::heroes_t id)
- {
--    return vec_heroes.Get(id);
-+    //VERBOSE("World::GetHeroes: id " << id << " vec_heroes.size() " << vec_heroes.size());
-+    if(id >= vec_heroes.size())
-+        return NULL;
-+    Heroes* h = vec_heroes.Get(id);
-+    //VERBOSE("World::GetHeroes: id " << id << " hero " << h->GetID() << " name " << h->GetName());
-+    return h;
- }
- 
- const Heroes* World::GetHeroes(Heroes::heroes_t id) const
- {
--    return vec_heroes.Get(id);
-+    //VERBOSE("World::GetHeroes: id " << id << " vec_heroes.size() " << vec_heroes.size());
-+    if(id >= vec_heroes.size())
-+        return NULL;
-+    const Heroes* h = vec_heroes.Get(id);
-+    //VERBOSE("World::GetHeroes: id " << id << " hero " << h->GetID() << " name " << h->GetName());
-+    return h;
- }
- 
- /* get heroes from index maps */
 Index: src/fheroes2/network/server.cpp
 ===================================================================
---- src/fheroes2/network/server.cpp	(revision 2761)
+--- src/fheroes2/network/server.cpp	(revision 2769)
 +++ src/fheroes2/network/server.cpp	(working copy)
 @@ -876,7 +876,7 @@
  

     }
Index: src/fheroes2/network/localclient.cpp
===================================================================
--- src/fheroes2/network/localclient.cpp	(revision 2761)
+++ src/fheroes2/network/localclient.cpp	(working copy)
@@ -490,7 +490,7 @@
 	    {

Index: src/engine/tools.cpp
===================================================================
--- src/engine/tools.cpp	(revision 2769)
+++ src/engine/tools.cpp	(working copy)
@@ -761,7 +761,7 @@
     if(stat(name.c_str(), &fs) || !S_ISREG(fs.st_mode))
