diff --git a/cmd/bblfshctl/cmd/driver_remove.go b/cmd/bblfshctl/cmd/driver_remove.go
index 6b64025..84f2669 100644
--- a/cmd/bblfshctl/cmd/driver_remove.go
+++ b/cmd/bblfshctl/cmd/driver_remove.go
@@ -48,12 +48,13 @@ func (c *DriverRemoveCommand) Execute(args []string) error {
 
 	for _, lang := range langs {
 		r, err := c.srv.RemoveDriver(ctx, &protocol.RemoveDriverRequest{Language: lang})
-		if err != nil || len(r.Errors) > 0 {
+		if err != nil {
+			return err
+		} else if len(r.Errors) != 0 {
 			for _, e := range r.Errors {
 				fmt.Fprintf(os.Stderr, "Error, %s\n", e)
 			}
-
-			return err
+			return fmt.Errorf("driver remove failed: %v", r.Errors)
 		}
 	}
 	return nil