diff --git a/services/implementation/include/credential/dm_credential_manager.h b/services/implementation/include/credential/dm_credential_manager.h
index 845ff6bb..5e657084 100644
--- a/services/implementation/include/credential/dm_credential_manager.h
+++ b/services/implementation/include/credential/dm_credential_manager.h
@@ -43,14 +43,14 @@ public:
      * @tc.desc: Register Credential Callback Info of the DmCredential Manager
      * @tc.type: FUNC
      */
-    void RegisterCredentialCallback(const std::string &pkgName);
+    int32_t RegisterCredentialCallback(const std::string &pkgName);
 
     /**
      * @tc.name: HiChainConnector::UnRegisterCredentialCallback
      * @tc.desc: UnRegister Credential Callback Info of the DmCredential Manager
      * @tc.type: FUNC
      */
-    void UnRegisterCredentialCallback(const std::string &pkgName);
+    int32_t UnRegisterCredentialCallback(const std::string &pkgName);
 
     /**
      * @tc.name: HiChainConnector::RequestCredential
diff --git a/services/implementation/src/credential/dm_credential_manager.cpp b/services/implementation/src/credential/dm_credential_manager.cpp
index b276ea20..c600471c 100644
--- a/services/implementation/src/credential/dm_credential_manager.cpp
+++ b/services/implementation/src/credential/dm_credential_manager.cpp
@@ -220,23 +220,23 @@ void DmCredentialManager::OnGroupResult(int64_t requestId, int32_t action,
     listener_->OnCredentialResult(pkgName_, action, resultInfo);
 }
 
-void DmCredentialManager::RegisterCredentialCallback(const std::string &pkgName)
+int32_t DmCredentialManager::RegisterCredentialCallback(const std::string &pkgName)
 {
     if (pkgName.empty()) {
         LOGE("DmCredentialManager::RegisterCredentialCallback input param is empty");
-        return;
+        return ERR_DM_FAILED;
     }
     LOGI("DmCredentialManager::RegisterCredentialCallback pkgName=%s",
         GetAnonyString(pkgName).c_str());
     credentialVec_.push_back(pkgName);
-    hiChainConnector_->RegisterHiChainGroupCallback(std::shared_ptr<IDmGroupResCallback>(shared_from_this()));
+    return hiChainConnector_->RegisterHiChainGroupCallback(std::shared_ptr<IDmGroupResCallback>(shared_from_this()));
 }
 
-void DmCredentialManager::UnRegisterCredentialCallback(const std::string &pkgName)
+int32_t DmCredentialManager::UnRegisterCredentialCallback(const std::string &pkgName)
 {
     if (pkgName.empty()) {
         LOGE("DmCredentialManager::UnRegisterCredentialStateCallback input param is empty");
-        return;
+        return ERR_DM_FAILED;
     }
     LOGI("DmCredentialManager::UnRegisterCredentialStateCallback pkgName=%s",
         GetAnonyString(pkgName).c_str());
@@ -244,7 +244,7 @@ void DmCredentialManager::UnRegisterCredentialCallback(const std::string &pkgNam
     if (iter != credentialVec_.end()) {
         credentialVec_.erase(iter);
     }
-    hiChainConnector_->UnRegisterHiChainGroupCallback();
+    return hiChainConnector_->UnRegisterHiChainGroupCallback();
 }
 
 int32_t DmCredentialManager::GetCredentialData(const std::string &credentialInfo, const CredentialData &inputCreData,
diff --git a/services/implementation/src/dependency/hichain/hichain_connector.cpp b/services/implementation/src/dependency/hichain/hichain_connector.cpp
index c84baca0..1a68f58b 100644
--- a/services/implementation/src/dependency/hichain/hichain_connector.cpp
+++ b/services/implementation/src/dependency/hichain/hichain_connector.cpp
@@ -769,10 +769,10 @@ int32_t HiChainConnector::GetGroupId(const std::string &userId, const int32_t gr
         LOGI("groupinfo.groupId:%s", groupinfo.groupId.c_str());
         if (groupinfo.userId == userId) {
             groupId = groupinfo.groupId;
-            break;
+            return DM_OK;
         }
     }
-    return DM_OK;
+    return ERR_DM_FAILED;
 }
 
 int32_t HiChainConnector::addMultiMembers(const int32_t groupType, const std::string &userId,
diff --git a/services/implementation/src/device_manager_service_impl.cpp b/services/implementation/src/device_manager_service_impl.cpp
index 35d447f4..ad4a5181 100644
--- a/services/implementation/src/device_manager_service_impl.cpp
+++ b/services/implementation/src/device_manager_service_impl.cpp
@@ -279,10 +279,11 @@ int32_t DeviceManagerServiceImpl::RequestCredential(const std::string &reqJsonSt
         LOGE("reqJsonStr is empty");
         return ERR_DM_INPUT_PARAMETER_EMPTY;
     }
-    if (credentialMgr_!= nullptr) {
-        credentialMgr_->RequestCredential(reqJsonStr, returnJsonStr);
+    if (credentialMgr_== nullptr) {
+        LOGE("credentialMgr_ is nullptr");
+        return ERR_DM_POINT_NULL;
     }
-    return DM_OK;
+    return credentialMgr_->RequestCredential(reqJsonStr, returnJsonStr);
 }
 
 int32_t DeviceManagerServiceImpl::ImportCredential(const std::string &pkgName, const std::string &credentialInfo)
@@ -295,10 +296,11 @@ int32_t DeviceManagerServiceImpl::ImportCredential(const std::string &pkgName, c
         LOGE("credentialInfo is empty");
         return ERR_DM_INPUT_PARAMETER_EMPTY;
     }
-    if (credentialMgr_!= nullptr) {
-        credentialMgr_->ImportCredential(pkgName, credentialInfo);
+    if (credentialMgr_== nullptr) {
+        LOGE("credentialMgr_ is nullptr");
+        return ERR_DM_POINT_NULL;
     }
-    return DM_OK;
+    return credentialMgr_->ImportCredential(pkgName, credentialInfo);
 }
 
 int32_t DeviceManagerServiceImpl::DeleteCredential(const std::string &pkgName, const std::string &deleteInfo)
@@ -311,10 +313,11 @@ int32_t DeviceManagerServiceImpl::DeleteCredential(const std::string &pkgName, c
         LOGE("deleteInfo is empty");
         return ERR_DM_INPUT_PARAMETER_EMPTY;
     }
-    if (credentialMgr_!= nullptr) {
-        credentialMgr_->DeleteCredential(pkgName, deleteInfo);
+    if (credentialMgr_== nullptr) {
+        LOGE("credentialMgr_ is nullptr");
+        return ERR_DM_POINT_NULL;
     }
-    return DM_OK;
+    return credentialMgr_->DeleteCredential(pkgName, deleteInfo);
 }
 
 int32_t DeviceManagerServiceImpl::RegisterCredentialCallback(const std::string &pkgName)
@@ -323,10 +326,11 @@ int32_t DeviceManagerServiceImpl::RegisterCredentialCallback(const std::string &
         LOGE("RegisterCredentialCallback failed, pkgName is empty");
         return ERR_DM_INPUT_PARAMETER_EMPTY;
     }
-    if (credentialMgr_ != nullptr) {
-        credentialMgr_->RegisterCredentialCallback(pkgName);
+    if (credentialMgr_ == nullptr) {
+        LOGE("credentialMgr_ is nullptr");
+        return ERR_DM_POINT_NULL;
     }
-    return DM_OK;
+    return credentialMgr_->RegisterCredentialCallback(pkgName);
 }
 
 int32_t DeviceManagerServiceImpl::UnRegisterCredentialCallback(const std::string &pkgName)
@@ -335,10 +339,11 @@ int32_t DeviceManagerServiceImpl::UnRegisterCredentialCallback(const std::string
         LOGE("UnRegisterCredentialCallback failed, pkgName is empty");
         return ERR_DM_INPUT_PARAMETER_EMPTY;
     }
-    if (credentialMgr_!= nullptr) {
-        credentialMgr_->UnRegisterCredentialCallback(pkgName);
+    if (credentialMgr_== nullptr) {
+        LOGE("credentialMgr_ is nullptr");
+        return ERR_DM_POINT_NULL;
     }
-    return DM_OK;
+    return credentialMgr_->UnRegisterCredentialCallback(pkgName);
 }
 
 extern "C" IDeviceManagerServiceImpl *CreateDMServiceObject(void)