diff --git a/discovery/service.go b/discovery/service.go
index af7f7fe..a77ee5b 100644
--- a/discovery/service.go
+++ b/discovery/service.go
@@ -2,6 +2,7 @@ package discovery
 
 import (
 	"context"
+
 	"github.com/nuts-foundation/go-nuts-client/nuts"
 	"github.com/nuts-foundation/go-nuts-client/nuts/discovery"
 )
@@ -25,9 +26,6 @@ func (i Service) ActivationStatus(ctx context.Context, serviceID string, subject
 	if err != nil {
 		return nil, err
 	}
-	if err != nil {
-		return nil, err
-	}
 	result := &DIDStatus{
 		ServiceID: serviceID,
 		Active:    response.JSON200.Activated,
diff --git a/identity/service.go b/identity/service.go
index ad107cd..9d04887 100644
--- a/identity/service.go
+++ b/identity/service.go
@@ -68,15 +68,12 @@ func (i Service) Get(ctx context.Context, subjectID string) (*IdentityDetails, e
 
 	// Get DIDDocuments
 	for _, currentDID := range identity.DIDs {
-		resp, err := i.VDRClient.ResolveDID(ctx, currentDID)
+		httpResponse, err := i.VDRClient.ResolveDID(ctx, currentDID)
+		response, err := nuts.ParseResponse(err, httpResponse, vdr.ParseResolveDIDResponse)
 		if err != nil {
 			return nil, err
 		}
-		didResponse, err := vdr.ParseResolveDIDResponse(resp)
-		if err != nil {
-			return nil, err
-		}
-		result.DIDDocuments = append(result.DIDDocuments, didResponse.JSON200.Document)
+		result.DIDDocuments = append(result.DIDDocuments, response.JSON200.Document)
 	}
 
 	// Get DiscoveryService status