diff --git a/samgr/adapter/posix/thread_adapter.c b/samgr/adapter/posix/thread_adapter.c
index d855abb56368091c2a8131f0b8a8cbcaaef320ff..f96e0f2178682945079b7269ca4dcaf26d14df11 100755
--- a/samgr/adapter/posix/thread_adapter.c
+++ b/samgr/adapter/posix/thread_adapter.c
@@ -64,13 +64,13 @@ ThreadId THREAD_Create(Runnable run, void *argv, const ThreadAttr *attr)
     pthread_attr_t threadAttr;
     pthread_attr_init(&threadAttr);
     pthread_attr_setstacksize(&threadAttr, (attr->stackSize | MIN_STACK_SIZE));
-    pthread_attr_setinheritsched(&threadAttr, PTHREAD_EXPLICIT_SCHED);
 #ifdef SAMGR_LINUX_ADAPTER
     struct sched_param sched = {attr->priority};
 #else
+    pthread_attr_setinheritsched(&threadAttr, PTHREAD_EXPLICIT_SCHED);
     struct sched_param sched = {PRI_BUTT - attr->priority};
-#endif
     pthread_attr_setschedpolicy(&threadAttr, SCHED_RR);
+#endif
     pthread_attr_setschedparam(&threadAttr, &sched);
     pthread_key_create(&g_localKey, NULL);
     pthread_t threadId = 0;
diff --git a/samgr/source/samgr_lite.c b/samgr/source/samgr_lite.c
index aac75612f96717314764be567725ab8dc3647b24..608e429bec1864dcb90709d0de02f7daad67c896 100755
--- a/samgr/source/samgr_lite.c
+++ b/samgr/source/samgr_lite.c
@@ -125,7 +125,7 @@ void SAMGR_Bootstrap(void)
     VECTOR_Clear(&initServices);
     int32 err = InitCompleted();
     if (err != EC_SUCCESS) {
-        HILOG_INFO(HILOG_MODULE_SAMGR, "Goto next boot step failed! errno:%d", err);
+        HILOG_INFO(HILOG_MODULE_SAMGR, "Goto next boot step return code:%d", err);
     }
 }
 
@@ -484,7 +484,7 @@ static void HandleInitRequest(const Request *request, const Response *response)
                serviceImpl->service->GetName(serviceImpl->service), serviceImpl->ops.timestamp - lastTime);
     int32 err = InitCompleted();
     if (err != EC_SUCCESS) {
-        HILOG_INFO(HILOG_MODULE_SAMGR, "Goto next boot step failed! errno:%d", err);
+        HILOG_INFO(HILOG_MODULE_SAMGR, "Goto next boot step return code:%d", err);
     }
 }
 
diff --git a/samgr_client/source/remote_register.c b/samgr_client/source/remote_register.c
index 6f021da475eb4e396cb7094204efa9583c513ad2..4b38027d8765a57d76b62bb0eaaee2716caf082b 100755
--- a/samgr_client/source/remote_register.c
+++ b/samgr_client/source/remote_register.c
@@ -59,6 +59,9 @@ int __attribute__((weak)) SAMGR_RegisterServiceApi(const char *service, const ch
 IUnknown *__attribute__((weak)) SAMGR_FindServiceApi(const char *service, const char *feature)
 {
     InitializeRegistry();
+    if (service == NULL) {
+        return NULL;
+    }
     SaName key = {service, feature};
     // the proxy already exits.
     int index = VECTOR_FindByKey(&g_remoteRegister.clients, &key);
diff --git a/samgr_endpoint/source/default_client.c b/samgr_endpoint/source/default_client.c
index efb19ec8059a720ea8172fa2a3deabdb70086c89..bd17e009ef8ad9d2e87047ceca7ac75a849d9934 100755
--- a/samgr_endpoint/source/default_client.c
+++ b/samgr_endpoint/source/default_client.c
@@ -100,7 +100,7 @@ int SAMGR_RegisterQueryIdentity(QueryIdentity query)
 
 SvcIdentity SAMGR_GetRemoteIdentity(const char *service, const char *feature)
 {
-    if (g_queryID != NULL) {
+    if (service != NULL && g_queryID != NULL) {
         return g_queryID(service, feature);
     }
     SvcIdentity identity = {INVALID_INDEX, INVALID_INDEX, INVALID_INDEX};
diff --git a/samgr_endpoint/source/endpoint.c b/samgr_endpoint/source/endpoint.c
index f4d4e600672f5d84256888cff7200386b621ac72..43558a0ed8ef496c5de2d7093ea447ffbe54674c 100755
--- a/samgr_endpoint/source/endpoint.c
+++ b/samgr_endpoint/source/endpoint.c
@@ -156,11 +156,10 @@ int SAMGR_ProcPolicy(const Endpoint *endpoint, const SaName *saName, int token)
         HILOG_INFO(HILOG_MODULE_SAMGR, "Register server sa<%s, %s> id<%u, %u> retry:%d ret:%d!",
                    saName->service, saName->feature, saInfo.handle, saInfo.token, retry, ret);
         ret = AddPolicyToRouter(endpoint, &saInfo, policy, policyNum);
+        SAMGR_Free(policy);
         if (ret == EC_SUCCESS) {
-            SAMGR_Free(policy);
             break;
         }
-        SAMGR_Free(policy);
         sleep(REGISTER_RETRY_INTERVAL);
     }
     return ret;
diff --git a/samgr_server/source/samgr_server.c b/samgr_server/source/samgr_server.c
index 3b580a351b457b281007675705deb7bbea756979..f2153725d5a825c4041314d3dce789715ee2f130 100755
--- a/samgr_server/source/samgr_server.c
+++ b/samgr_server/source/samgr_server.c
@@ -100,6 +100,9 @@ int SAMGR_RegisterServiceApi(const char *service, const char *feature, const Ide
 
 IUnknown *SAMGR_FindServiceApi(const char *service, const char *feature)
 {
+    if (service == NULL) {
+        return NULL;
+    }
     SaName key = {service, feature};
     // the proxy already exits.
     int index = VECTOR_FindByKey(&g_server.clients, &key);