diff -up 8Kingdoms-1.1.0/world/world_engine.cpp~ 8Kingdoms-1.1.0/world/world_engine.cpp
--- 8Kingdoms-1.1.0/world/world_engine.cpp~	2007-12-02 12:43:53.000000000 +0100
+++ 8Kingdoms-1.1.0/world/world_engine.cpp	2007-12-02 12:43:53.000000000 +0100
@@ -1214,7 +1214,10 @@ int TWorldServerEngine::unitMove(int uni
   }
 
   if (!can_move)
+  {
+    unlock();
     return ERR_NotOperational;   
+  }
 
   TPacket_RCT_UNIT_MOVE * packet = new TPacket_RCT_UNIT_MOVE();
   packet->unit_id = unit_id;
diff -up 8Kingdoms-1.1.0/world/world_client.cpp~ 8Kingdoms-1.1.0/world/world_client.cpp
--- 8Kingdoms-1.1.0/world/world_client.cpp~	2007-12-02 12:09:28.000000000 +0100
+++ 8Kingdoms-1.1.0/world/world_client.cpp	2007-12-02 12:09:28.000000000 +0100
@@ -321,6 +321,7 @@ RVAL WORLD_CLIENT_MSG_HANDLER(MESSAGE_ID
                   
                   if (world_client[i]->state == WCS_GAME_ENDED && action_type == AT_ENDGAME) {
                     // zprava o ukonceni hry pro jiz ukoncenou hru - ignoruji
+                    world_client_mutex.unlock();
                     break;
                   } 
                   else if (!(((action_type == AT_GAME_START) && (world_client[i]->state >= WCS_WORLD_INITIALIZED) && (world_client[i]->state < WCS_GAME_STARTED))
@@ -328,6 +329,7 @@ RVAL WORLD_CLIENT_MSG_HANDLER(MESSAGE_ID
                     (world_client[i]->state == WCS_GAME_STARTED)
                     )) {
                     // zprava prisla v nevhodnou chvili - ignoruji
+                    world_client_mutex.unlock();
                     break;
                   }