diff --git a/cmd/metal-api/internal/service/image-service.go b/cmd/metal-api/internal/service/image-service.go index 707d97409..f78c34a81 100644 --- a/cmd/metal-api/internal/service/image-service.go +++ b/cmd/metal-api/internal/service/image-service.go @@ -375,10 +375,8 @@ func (r *imageResource) deleteImage(request *restful.Request, response *restful. machines := r.machinesByImage(ms, img.ID) if len(machines) > 0 { - if err != nil { - r.sendError(request, response, httperrors.UnprocessableEntity(fmt.Errorf("image %s is in use by machines:%v", img.ID, machines))) - return - } + r.sendError(request, response, httperrors.UnprocessableEntity(fmt.Errorf("image %s is in use by machines:%v", img.ID, machines))) + return } err = r.ds.DeleteImage(img) diff --git a/cmd/metal-api/internal/service/network-service.go b/cmd/metal-api/internal/service/network-service.go index 0872f05c7..1183927ec 100644 --- a/cmd/metal-api/internal/service/network-service.go +++ b/cmd/metal-api/internal/service/network-service.go @@ -700,10 +700,8 @@ func (r *networkResource) deleteNetwork(request *restful.Request, response *rest } if len(children) != 0 { - if err != nil { - r.sendError(request, response, defaultError(errors.New("network cannot be deleted because there are children of this network"))) - return - } + r.sendError(request, response, defaultError(errors.New("network cannot be deleted because there are children of this network"))) + return } allIPs, err := r.ds.ListIPs()