diff --git a/pkg/cmd/gist/rename/rename.go b/pkg/cmd/gist/rename/rename.go
index 6cf509632..adec3032a 100644
--- a/pkg/cmd/gist/rename/rename.go
+++ b/pkg/cmd/gist/rename/rename.go
@@ -44,6 +44,10 @@ func NewCmdRename(f *cmdutil.Factory, runf func(*RenameOptions) error) *cobra.Co
 				opts.Selector = args[0]
 				opts.OldFileName = args[1]
 				opts.NewFileName = args[2]
+			} else if len(args) == 2 {
+				return cmdutil.FlagErrorf("<newFilename> is missing")
+			} else if len(args) == 1 {
+				return cmdutil.FlagErrorf("<oldFilename> and <newFilename> are missing")
 			} else {
 				return cmdutil.FlagErrorf("not enough arguments")
 			}