diff --git a/CAPI/cpp/API/src/logic.cpp b/CAPI/cpp/API/src/logic.cpp
index 62167c4..2b7cb91 100644
--- a/CAPI/cpp/API/src/logic.cpp
+++ b/CAPI/cpp/API/src/logic.cpp
@@ -315,68 +315,81 @@ void Logic::ProcessMessage()
 {
     auto messageThread = [this]()
     {
-        logger->info("Message thread start!");
-        pComm->AddPlayer(playerID, playerType, studentType, trickerType);
-        while (gameState != THUAI6::GameState::GameEnd)
+        try
         {
-            auto clientMsg = pComm->GetMessage2Client();  // 在获得新消息之前阻塞
-            logger->debug("Get message from server!");
-            gameState = Proto2THUAI6::gameStateDict[clientMsg.game_state()];
-            switch (gameState)
+            logger->info("Message thread start!");
+            pComm->AddPlayer(playerID, playerType, studentType, trickerType);
+            while (gameState != THUAI6::GameState::GameEnd)
             {
-                case THUAI6::GameState::GameStart:
-                    logger->info("Game Start!");
+                auto clientMsg = pComm->GetMessage2Client();  // 在获得新消息之前阻塞
+                logger->debug("Get message from server!");
+                gameState = Proto2THUAI6::gameStateDict[clientMsg.game_state()];
+                switch (gameState)
+                {
+                    case THUAI6::GameState::GameStart:
+                        logger->info("Game Start!");
 
-                    // 读取地图
-                    for (const auto& item : clientMsg.obj_message())
-                        if (Proto2THUAI6::messageOfObjDict[item.message_of_obj_case()] == THUAI6::MessageOfObj::MapMessage)
-                        {
-                            auto map = std::vector<std::vector<THUAI6::PlaceType>>();
-                            auto mapResult = item.map_message();
-                            for (int i = 0; i < item.map_message().row_size(); i++)
+                        // 读取地图
+                        for (const auto& item : clientMsg.obj_message())
+                            if (Proto2THUAI6::messageOfObjDict[item.message_of_obj_case()] == THUAI6::MessageOfObj::MapMessage)
                             {
-                                std::vector<THUAI6::PlaceType> row;
-                                for (int j = 0; j < mapResult.row(i).col_size(); j++)
+                                auto map = std::vector<std::vector<THUAI6::PlaceType>>();
+                                auto mapResult = item.map_message();
+                                for (int i = 0; i < item.map_message().row_size(); i++)
                                 {
-                                    if (Proto2THUAI6::placeTypeDict.count(mapResult.row(i).col(j)) == 0)
-                                        logger->error("Unknown place type!");
-                                    row.push_back(Proto2THUAI6::placeTypeDict[mapResult.row(i).col(j)]);
+                                    std::vector<THUAI6::PlaceType> row;
+                                    for (int j = 0; j < mapResult.row(i).col_size(); j++)
+                                    {
+                                        if (Proto2THUAI6::placeTypeDict.count(mapResult.row(i).col(j)) == 0)
+                                            logger->error("Unknown place type!");
+                                        row.push_back(Proto2THUAI6::placeTypeDict[mapResult.row(i).col(j)]);
+                                    }
+                                    map.push_back(std::move(row));
                                 }
-                                map.push_back(std::move(row));
+                                bufferState->gameMap = std::move(map);
+                                currentState->gameMap = bufferState->gameMap;
+                                logger->info("Map loaded!");
+                                break;
                             }
-                            bufferState->gameMap = std::move(map);
-                            currentState->gameMap = bufferState->gameMap;
-                            logger->info("Map loaded!");
-                            break;
+                        if (currentState->gameMap.empty())
+                        {
+                            logger->error("Map not loaded!");
+                            throw std::runtime_error("Map not loaded!");
                         }
-                    if (currentState->gameMap.empty())
-                    {
-                        logger->error("Map not loaded!");
-                        throw std::runtime_error("Map not loaded!");
-                    }
-                    LoadBuffer(clientMsg);
+                        LoadBuffer(clientMsg);
 
-                    AILoop = true;
-                    UnBlockAI();
+                        AILoop = true;
+                        UnBlockAI();
 
-                    break;
-                case THUAI6::GameState::GameRunning:
+                        break;
+                    case THUAI6::GameState::GameRunning:
 
-                    LoadBuffer(clientMsg);
-                    break;
-                default:
-                    logger->debug("Unknown GameState!");
-                    break;
+                        LoadBuffer(clientMsg);
+                        break;
+                    default:
+                        logger->debug("Unknown GameState!");
+                        break;
+                }
             }
+            {
+                std::lock_guard<std::mutex> lock(mtxBuffer);
+                bufferUpdated = true;
+                counterBuffer = -1;
+            }
+            cvBuffer.notify_one();
+            logger->info("Game End!");
+            AILoop = false;
         }
+        catch (const std::exception& e)
         {
-            std::lock_guard<std::mutex> lock(mtxBuffer);
-            bufferUpdated = true;
-            counterBuffer = -1;
+            std::cerr << "C++ Exception: " << e.what() << std::endl;
+            AILoop = false;
+        }
+        catch (...)
+        {
+            std::cerr << "Unknown Exception!" << std::endl;
+            AILoop = false;
         }
-        cvBuffer.notify_one();
-        logger->info("Game End!");
-        AILoop = false;
     };
     std::thread(messageThread).detach();
 }
@@ -747,30 +760,41 @@ void Logic::Main(CreateAIFunc createAI, std::string IP, std::string port, bool f
     // 构造AI线程
     auto AIThread = [&]()
     {
+        try
         {
-            std::unique_lock<std::mutex> lock(mtxAI);
-            cvAI.wait(lock, [this]()
-                      { return AIStart; });
-        }
-        auto ai = createAI(playerID);
-
-        while (AILoop)
-        {
-            if (asynchronous)
             {
-                Wait();
-                timer->StartTimer();
-                timer->Play(*ai);
-                timer->EndTimer();
+                std::unique_lock<std::mutex> lock(mtxAI);
+                cvAI.wait(lock, [this]()
+                          { return AIStart; });
             }
-            else
+            auto ai = createAI(playerID);
+
+            while (AILoop)
             {
-                Update();
-                timer->StartTimer();
-                timer->Play(*ai);
-                timer->EndTimer();
+                if (asynchronous)
+                {
+                    Wait();
+                    timer->StartTimer();
+                    timer->Play(*ai);
+                    timer->EndTimer();
+                }
+                else
+                {
+                    Update();
+                    timer->StartTimer();
+                    timer->Play(*ai);
+                    timer->EndTimer();
+                }
             }
         }
+        catch (const std::exception& e)
+        {
+            std::cerr << "C++ Exception: " << e.what() << std::endl;
+        }
+        catch (...)
+        {
+            std::cerr << "Unknown Exception!" << std::endl;
+        }
     };
 
     // 连接服务器
diff --git a/CAPI/cpp/API/src/main.cpp b/CAPI/cpp/API/src/main.cpp
index 02276ee..22ca6da 100644
--- a/CAPI/cpp/API/src/main.cpp
+++ b/CAPI/cpp/API/src/main.cpp
@@ -115,7 +115,11 @@ int THUAI6Main(int argc, char** argv, CreateAIFunc AIBuilder)
     }
     catch (const std::exception& e)
     {
-        std::cerr << e.what() << '\n';
+        std::cerr << "C++ Exception: " << e.what() << '\n';
+    }
+    catch (...)
+    {
+        std::cerr << "Unknown Exception\n";
     }
     return 0;
 }