diff --git a/cli.go b/cli.go
index a5ae417..e925872 100644
--- a/cli.go
+++ b/cli.go
@@ -22,7 +22,11 @@ var Action = ShowHelp
 func Run(args []string) {
 
   set := flagSet(Flags)
-  set.Parse(args[1:])
+  err := set.Parse(args[1:])
+  if err != nil {
+    println(err)
+    return
+  }
 
 	context := NewContext(set)
 	if len(args) > 1 {
diff --git a/flag.go b/flag.go
index aabb86c..28430a6 100644
--- a/flag.go
+++ b/flag.go
@@ -36,7 +36,7 @@ func (f BoolFlag) Apply(set *flag.FlagSet) {
 }
 
 func flagSet(flags []Flag) *flag.FlagSet {
-  set := flag.NewFlagSet("set", flag.PanicOnError)
+  set := flag.NewFlagSet(Name, 0)
   for _, f := range flags {
     f.Apply(set)
   }