diff --git a/src/dtclient/activegate_tenant_info.go b/src/dtclient/activegate_tenant_info.go
index a2c1a8c064..dc9978e804 100644
--- a/src/dtclient/activegate_tenant_info.go
+++ b/src/dtclient/activegate_tenant_info.go
@@ -35,7 +35,6 @@ func (dtc *dynatraceClient) GetActiveGateTenantInfo() (*ActiveGateTenantInfo, er
 
 	tenantInfo, err := dtc.readResponseForActiveGateTenantInfo(data)
 	if err != nil {
-		log.Error(err, err.Error())
 		return nil, err
 	}
 	if len(tenantInfo.Endpoints) == 0 {
@@ -49,8 +48,8 @@ func (dtc *dynatraceClient) readResponseForActiveGateTenantInfo(response []byte)
 	agTenantInfo := &ActiveGateTenantInfo{}
 	err := json.Unmarshal(response, agTenantInfo)
 	if err != nil {
-		log.Error(err, "error unmarshalling json response")
-		return nil, errors.WithStack(err)
+		log.Error(err, "error unmarshalling activegate tenant info", "response", string(response))
+		return nil, err
 	}
 
 	return agTenantInfo, nil
diff --git a/src/dtclient/agent_tenant_info.go b/src/dtclient/agent_tenant_info.go
index dd3d44c030..80ca43de6e 100644
--- a/src/dtclient/agent_tenant_info.go
+++ b/src/dtclient/agent_tenant_info.go
@@ -36,7 +36,6 @@ func (dtc *dynatraceClient) GetAgentTenantInfo() (*AgentTenantInfo, error) {
 
 	tenantInfo, err := dtc.readResponseForTenantInfo(data)
 	if err != nil {
-		log.Error(err, err.Error())
 		return nil, errors.WithStack(err)
 	}
 	if len(tenantInfo.Endpoints) <= 0 {
@@ -57,8 +56,8 @@ func (dtc *dynatraceClient) readResponseForTenantInfo(response []byte) (*AgentTe
 	jr := &jsonResponse{}
 	err := json.Unmarshal(response, jr)
 	if err != nil {
-		log.Error(err, "error unmarshalling json response")
-		return nil, errors.WithStack(err)
+		log.Error(err, "unable to unmarshal tenant info response")
+		return nil, err
 	}
 
 	return &AgentTenantInfo{
diff --git a/src/dtclient/agent_version.go b/src/dtclient/agent_version.go
index 135a4bc230..1d454daa2c 100644
--- a/src/dtclient/agent_version.go
+++ b/src/dtclient/agent_version.go
@@ -56,7 +56,7 @@ func (dtc *dynatraceClient) readResponseForLatestVersion(response []byte) (strin
 	jr := &jsonResponse{}
 	err := json.Unmarshal(response, jr)
 	if err != nil {
-		log.Error(err, "error unmarshalling json response")
+		log.Error(err, "error unmarshalling latest agent version response", "response", string(response))
 		return "", err
 	}
 
diff --git a/src/dtclient/communication_hosts.go b/src/dtclient/communication_hosts.go
index cda2e03222..4113a8d98e 100644
--- a/src/dtclient/communication_hosts.go
+++ b/src/dtclient/communication_hosts.go
@@ -51,7 +51,7 @@ func (dtc *dynatraceClient) readResponseForConnectionInfo(response []byte) (Conn
 	resp := jsonResponse{}
 	err := json.Unmarshal(response, &resp)
 	if err != nil {
-		log.Error(err, "error unmarshalling json response")
+		log.Error(err, "error unmarshalling connection info response", "response", string(response))
 		return ConnectionInfo{}, err
 	}
 
diff --git a/src/dtclient/dynatrace_client.go b/src/dtclient/dynatrace_client.go
index e907a9c23d..8314f08787 100644
--- a/src/dtclient/dynatrace_client.go
+++ b/src/dtclient/dynatrace_client.go
@@ -197,7 +197,7 @@ func (dtc *dynatraceClient) setHostCacheFromResponse(response []byte) error {
 	var hostInfoResponses []hostInfoResponse
 	err := json.Unmarshal(response, &hostInfoResponses)
 	if err != nil {
-		log.Error(err, "error unmarshalling json response")
+		log.Error(err, "error unmarshalling json response", "response", string(response))
 		return errors.WithStack(err)
 	}
 
diff --git a/src/dtclient/processmoduleconfig.go b/src/dtclient/processmoduleconfig.go
index 94fb04281a..4fedd08efa 100644
--- a/src/dtclient/processmoduleconfig.go
+++ b/src/dtclient/processmoduleconfig.go
@@ -77,7 +77,7 @@ func (dtc *dynatraceClient) GetProcessModuleConfig(prevRevision uint) (*ProcessM
 		return &ProcessModuleConfig{}, nil
 	}
 	if err != nil {
-		return nil, fmt.Errorf("error making get request to dynatrace api: %w", err)
+		return nil, fmt.Errorf("error while requesting process module config: %v", err)
 	}
 	defer func() {
 		//Swallow error, nothing has to be done at this point
@@ -131,7 +131,7 @@ func (dtc *dynatraceClient) readResponseForProcessModuleConfig(response []byte)
 	resp := ProcessModuleConfig{}
 	err := json.Unmarshal(response, &resp)
 	if err != nil {
-		log.Error(err, "error unmarshalling json response")
+		log.Error(err, "error unmarshalling processmoduleconfig response", "response", string(response))
 		return nil, err
 	}
 
diff --git a/src/dtclient/token.go b/src/dtclient/token.go
index 46aa14ad86..60c71de043 100644
--- a/src/dtclient/token.go
+++ b/src/dtclient/token.go
@@ -63,7 +63,8 @@ func (dtc *dynatraceClient) readResponseForTokenScopes(response []byte) (TokenSc
 	}
 
 	if err := json.Unmarshal(response, &jr); err != nil {
-		return nil, fmt.Errorf("error unmarshalling json response: %w", err)
+		log.Error(err, "unable to unmarshal token scopes response", "response", string(response))
+		return nil, err
 	}
 
 	return jr.Scopes, nil