diff --git a/cmd/osbuild-package-sets/main.go b/cmd/osbuild-package-sets/main.go
index 87f5218d0..506efbcab 100644
--- a/cmd/osbuild-package-sets/main.go
+++ b/cmd/osbuild-package-sets/main.go
@@ -22,11 +22,16 @@ func main() {
 	flag.StringVar(&imageName, "image", "", "Image name")
 	flag.Parse()
 
+	if distroName == "" || archName == "" || imageName == "" {
+		flag.Usage()
+		os.Exit(1)
+	}
+
 	dr := distroregistry.NewDefault()
 
 	distro := dr.GetDistro(distroName)
 	if distro == nil {
-		panic(fmt.Errorf("Distro %q does not exist", distro))
+		panic(fmt.Errorf("Distro %q does not exist", distroName))
 	}
 
 	arch, err := distro.GetArch(archName)