diff --git a/source/libs/catalog/src/ctgCache.c b/source/libs/catalog/src/ctgCache.c
index 62890b83266e1d03ce9ee81dce601f1b3c53c90c..277516686b342fa855a87bb518541ce6147c6604 100644
--- a/source/libs/catalog/src/ctgCache.c
+++ b/source/libs/catalog/src/ctgCache.c
@@ -1899,7 +1899,7 @@ _return:
 
 
 void ctgUpdateThreadUnexpectedStopped(void) {
-  if (CTG_IS_LOCKED(&gCtgMgmt.lock) > 0) CTG_UNLOCK(CTG_READ, &gCtgMgmt.lock);
+  if (!atomic_load_8((int8_t*)&gCtgMgmt.exit) && CTG_IS_LOCKED(&gCtgMgmt.lock) > 0) CTG_UNLOCK(CTG_READ, &gCtgMgmt.lock);
 }
 
 void ctgCleanupCacheQueue(void) {
diff --git a/tests/system-test/7-tmq/basic5.py b/tests/system-test/7-tmq/basic5.py
index 3d9efea938ab3cf35e33249c31c351dab80de8f7..a10eaf1fb589ecaec08173de4d523c9bd6d54189 100644
--- a/tests/system-test/7-tmq/basic5.py
+++ b/tests/system-test/7-tmq/basic5.py
@@ -134,7 +134,7 @@ class TDTestCase:
         parameterDict['cfg'] = cfgPath
         prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
         prepareEnvThread.start()
-        time.sleep(2)
+        prepareEnvThread.join()
         
         # wait stb ready
         while 1:
@@ -245,6 +245,7 @@ class TDTestCase:
 
         prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
         prepareEnvThread.start()
+        prepareEnvThread.join()
         
         # wait db ready
         while 1:
@@ -371,6 +372,7 @@ class TDTestCase:
 
         prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
         prepareEnvThread.start()
+        prepareEnvThread.join()
         
         # wait db ready
         while 1:
diff --git a/tests/system-test/test-all.bat b/tests/system-test/test-all.bat
index 076be6563a8c110143e2c3e59e83f3deb6d46a11..0929b1fc6e1309d0655c54e9ab2a370c772d4788 100644
--- a/tests/system-test/test-all.bat
+++ b/tests/system-test/test-all.bat
@@ -61,7 +61,8 @@ goto :eof
 set tt=%1
 set tt=%tt:.= %
 set tt=%tt::= %
-set index=1
+set tt=%tt: 0= %
+set /a index=1
 for %%a in (%tt%) do (
     if !index! EQU 1 (
         set /a hh=%%a
@@ -75,5 +76,5 @@ for %%a in (%tt%) do (
     )
    set /a index=index+1
 )
-set /a _timeTemp=(%hh%*60+%mm%)*60+%ss%  || echo hh:%hh% mm:%mm% ss:%ss%
+set /a _timeTemp=(%hh%*60+%mm%)*60+%ss%
 goto :eof
\ No newline at end of file
diff --git a/tests/system-test/test.py b/tests/system-test/test.py
index 47e0cefb52ead4763ff0c2552aa5b2af39377958..5a68f548da04a33f325fa549e044a8f2940e51ba 100644
--- a/tests/system-test/test.py
+++ b/tests/system-test/test.py
@@ -21,6 +21,7 @@ import base64
 import json
 import platform
 import socket
+import threading
 from distutils.log import warn as printf
 from fabric2 import Connection
 sys.path.append("../pytest")
@@ -30,6 +31,13 @@ from util.cases import *
 
 import taos
 
+def checkRunTimeError():
+    import win32gui
+    while 1:
+        time.sleep(1)
+        hwnd = win32gui.FindWindow(None, "Microsoft Visual C++ Runtime Library")
+        if hwnd:
+            os.system("TASKKILL /F /IM taosd.exe")
 
 if __name__ == "__main__":
     
@@ -42,9 +50,6 @@ if __name__ == "__main__":
     logSql = True
     stop = 0
     restart = False
-    windows = 0
-    if platform.system().lower() == 'windows':
-        windows = 1
     updateCfgDict = {}
     execCmd = ""
     opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghrd:k:e:', [
@@ -159,7 +164,9 @@ if __name__ == "__main__":
             host = masterIp
 
     tdLog.info("Procedures for tdengine deployed in %s" % (host))
-    if windows:
+    if platform.system().lower() == 'windows':
+        if (masterIp == "" and not fileName[0:12] == "0-others\\udf"):
+            threading.Thread(target=checkRunTimeError,daemon=True).start()
         tdCases.logSql(logSql)
         tdLog.info("Procedures for testing self-deployment")
         tdDnodes.init(deployPath, masterIp)