diff --git a/handler/handler.go b/handler/handler.go
index 5babaa48885be2e31e60017a07c428d954fe6e93..c64f5b989976403bc94fdd68ef9b20fdabe4ad34 100644
--- a/handler/handler.go
+++ b/handler/handler.go
@@ -93,7 +93,13 @@ func (s *KeyStorageServerImpl) GetKey(ctx context.Context, in *api.GetKeyRequest
 		return getKeyResponse, nil
 	}
 
-	data, _ := client.DoGetDataCall("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType))
+	data, err := client.DoGetDataCall("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType))
+	if err != nil {
+		getKeyResponse.Key = nil
+		getKeyResponse.StatusList = utils.AddStatus(getKeyResponse.StatusList,
+			"500", api.StatusType_ERROR, err.Error())
+		return getKeyResponse, nil
+	}
 
 	if data.Errors != "" {
 		getKeyResponse.Key = nil
@@ -128,7 +134,12 @@ func (s *KeyStorageServerImpl) SetKey(ctx context.Context, in *api.SetKeyRequest
 		return setKeyResponse, nil
 	}
 
-	data, _ := client.DoGetDataCall("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType))
+	data, err := client.DoGetDataCall("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType))
+	if err != nil {
+		setKeyResponse.StatusList = utils.AddStatus(setKeyResponse.StatusList,
+			"500", api.StatusType_ERROR, err.Error())
+		return setKeyResponse, nil
+	}
 
 	if data.Errors != "" {
 		setKeyResponse.StatusList = utils.AddStatus(setKeyResponse.StatusList,